Compare commits
48 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a35fecb62e
|
|||
| 2150a113eb | |||
| 904c0670ce | |||
| 0c81c2f90b | |||
| aef620bee2 | |||
| bf10957f66 | |||
| 787ac02f10 | |||
| 7088e06978 | |||
| 59efc13bff | |||
| d1eb9e744b | |||
|
6174ee5905
|
|||
| e84e27d6de | |||
| c185a11c2e | |||
| b9efe891bb | |||
| ce3aaf5901 | |||
| 27dc652aa4 | |||
| dc68e400fd | |||
| 923b0b0c6c | |||
| f6ea16f2b0 | |||
| 42767b9d89 | |||
| add7a40289 | |||
| 631471b25a | |||
| b03586d60a | |||
| e150c52775 | |||
| 3506b08989 | |||
| b5e42606c8 | |||
| 929f0438fe | |||
| f589f13c2b | |||
|
e723141ede
|
|||
|
e84f4fc10c
|
|||
| 334dc72b21 | |||
| 257c0af573 | |||
| 0182d0e080 | |||
| b229be6867 | |||
|
b96b1c6723
|
|||
| 156329c963 | |||
| 46c7392a88 | |||
|
cb93a1e299
|
|||
| 208002904d | |||
| 552185046c | |||
| 018485f655 | |||
| e442421d39 | |||
| dde3b03b1c | |||
| 6627cf8f14 | |||
| 1c8d409443 | |||
| acb8c05c94 | |||
| 445be23066 | |||
| d6a55ab4ce |
@@ -13,7 +13,7 @@ applications:
|
|||||||
server: https://kubernetes.default.svc
|
server: https://kubernetes.default.svc
|
||||||
project: sys
|
project: sys
|
||||||
sources:
|
sources:
|
||||||
- repoURL: https://gitlab.com/oceanbox//manifests.git
|
- repoURL: https://git.oceanbox.io/platform/manifests.git
|
||||||
targetRevision: HEAD
|
targetRevision: HEAD
|
||||||
path: helmfile.d
|
path: helmfile.d
|
||||||
plugin:
|
plugin:
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
|
|||||||
type: application
|
type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
version: v2.11.0
|
version: v1.42.27
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application.
|
# incremented each time you make changes to the application.
|
||||||
appVersion: v2.11.0
|
appVersion: v1.42.27
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: diagrid-dashboard
|
- name: diagrid-dashboard
|
||||||
version: "0.1.0"
|
version: "0.1.0"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||||
tag: v2.11.0
|
tag: v1.42.27
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
init:
|
init:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: v2.11.0
|
version: v1.42.27
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "v2.11.0"
|
appVersion: "v1.42.27"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ image:
|
|||||||
# This sets the pull policy for images.
|
# This sets the pull policy for images.
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
# Overrides the image tag whose default is the chart appVersion.
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
tag: v2.11.0
|
tag: v1.42.27
|
||||||
# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
|
# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
- name: gitlab-pull-secret
|
- name: gitlab-pull-secret
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
|
|||||||
type: application
|
type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
version: v2.11.0
|
version: v1.42.27
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application.
|
# incremented each time you make changes to the application.
|
||||||
appVersion: v2.11.0
|
appVersion: v1.42.27
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: diagrid-dashboard
|
- name: diagrid-dashboard
|
||||||
version: "0.1.0"
|
version: "0.1.0"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||||
tag: v2.11.0
|
tag: v1.42.27
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
init:
|
init:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ releases:
|
|||||||
namespace: {{ .Environment.Name }}-openfga
|
namespace: {{ .Environment.Name }}-openfga
|
||||||
{{- end }}
|
{{- end }}
|
||||||
chart: openfga/openfga
|
chart: openfga/openfga
|
||||||
version: 0.3.5
|
version: 0.3.6
|
||||||
condition: openfga.enabled
|
condition: openfga.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/openfga/values/values.yaml
|
- ../values/openfga/values/values.yaml
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ releases:
|
|||||||
- name: opentelemetry-collector
|
- name: opentelemetry-collector
|
||||||
namespace: otel
|
namespace: otel
|
||||||
chart: open-telemetry/opentelemetry-collector
|
chart: open-telemetry/opentelemetry-collector
|
||||||
version: 0.156.2
|
version: 0.158.0
|
||||||
condition: otel.enabled
|
condition: otel.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/opentelemetry-collector/values/values.yaml
|
- ../values/opentelemetry-collector/values/values.yaml
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ releases:
|
|||||||
- name: velero
|
- name: velero
|
||||||
namespace: velero
|
namespace: velero
|
||||||
chart: velero/velero
|
chart: velero/velero
|
||||||
version: 12.0.1
|
version: 12.0.2
|
||||||
condition: velero.enabled
|
condition: velero.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/velero/values/velero.yaml.gotmpl
|
- ../values/velero/values/velero.yaml.gotmpl
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ spec:
|
|||||||
- https://kubernetes-sigs.github.io/metrics-server/
|
- https://kubernetes-sigs.github.io/metrics-server/
|
||||||
- https://git.oceanbox.io/platform/manifests.git
|
- https://git.oceanbox.io/platform/manifests.git
|
||||||
- https://git.oceanbox.io/platform/manifests
|
- https://git.oceanbox.io/platform/manifests
|
||||||
- https://gitlab.com/oceanbox/manifests.git
|
- https://git.oceanbox.io/oceanbox/manifests.git
|
||||||
- https://kubernetes.github.io/ingress-nginx
|
- https://kubernetes.github.io/ingress-nginx
|
||||||
- https://cloudnative-pg.github.io/charts
|
- https://cloudnative-pg.github.io/charts
|
||||||
- https://charts.jetstack.io
|
- https://charts.jetstack.io
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||||
tag: v2.10.0
|
tag: v2.13.1
|
||||||
|
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/app-id: "beta-atlantis"
|
dapr.io/app-id: "beta-atlantis"
|
||||||
@@ -11,7 +11,7 @@ env:
|
|||||||
- name: APP_NAMESPACE
|
- name: APP_NAMESPACE
|
||||||
value: beta-atlantis
|
value: beta-atlantis
|
||||||
- name: APP_VERSION
|
- name: APP_VERSION
|
||||||
value: "2.10.0-beta"
|
value: "2.13.1-beta"
|
||||||
- name: LOG_LEVEL
|
- name: LOG_LEVEL
|
||||||
value: "1"
|
value: "1"
|
||||||
- name: ANALYTICS_WEB_ID
|
- name: ANALYTICS_WEB_ID
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||||
tag: acc3745a-debug
|
tag: 4733e529-debug
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/app-id: "staging-atlantis"
|
dapr.io/app-id: "staging-atlantis"
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -38,4 +38,4 @@ volumeMounts:
|
|||||||
readOnly: true
|
readOnly: true
|
||||||
subPath: appsettings.json
|
subPath: appsettings.json
|
||||||
image:
|
image:
|
||||||
tag: acc3745a-debug
|
tag: 4704e4f1-debug
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
tag: "cdfdc59d-debug"
|
tag: "b90f000e-debug"
|
||||||
env:
|
env:
|
||||||
- name: APP_VERSION
|
- name: APP_VERSION
|
||||||
value: "0.0.0"
|
value: "0.0.0"
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
clusterConfig:
|
clusterConfig:
|
||||||
manifests: https://gitlab.com/oceanbox/manifests.git
|
manifests: https://git.oceanbox.io/platform/manifests.git
|
||||||
env: "" #[dev, test, staging, prod]
|
env: "" #[dev, test, staging, prod]
|
||||||
initca: ""
|
initca: ""
|
||||||
domain: ".local"
|
domain: ".local"
|
||||||
|
|||||||
@@ -272,6 +272,14 @@ configMaps:
|
|||||||
{ "action": "accept", "src": [ "hanskristian.djuve@oceanbox.io" ], "dst": [ "hanskristian.djuve@oceanbox.io:*" ] },
|
{ "action": "accept", "src": [ "hanskristian.djuve@oceanbox.io" ], "dst": [ "hanskristian.djuve@oceanbox.io:*" ] },
|
||||||
{ "action": "accept", "src": [ "erlend.mundal@oceanbox.io" ], "dst": [ "erlend.mundal@oceanbox.io:*" ] },
|
{ "action": "accept", "src": [ "erlend.mundal@oceanbox.io" ], "dst": [ "erlend.mundal@oceanbox.io:*" ] },
|
||||||
// s/"\([^"]*\)"/{ "action": "accept", "src": [ "\1" ], "dst": [ "\1:*" ] },
|
// s/"\([^"]*\)"/{ "action": "accept", "src": [ "\1" ], "dst": [ "\1:*" ] },
|
||||||
|
],
|
||||||
|
"ssh": [
|
||||||
|
{
|
||||||
|
"action": "accept",
|
||||||
|
"src": [ "group:admin" ],
|
||||||
|
"dst": [ "autogroup:self", "tag:hpc", "tag:mumindalen", "tag:hel1" ],
|
||||||
|
"users": [ "autogroup:nonroot", "root" ]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
dns:
|
dns:
|
||||||
@@ -359,25 +367,21 @@ configMaps:
|
|||||||
|
|
||||||
{ "name": "jonas-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "jonas-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "jonas-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
{ "name": "jonas-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||||
{ "name": "jonas-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
|
||||||
{ "name": "stig-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "stig-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "stig-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
{ "name": "stig-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||||
{ "name": "stig-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
|
|
||||||
{ "name": "stig-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
|
||||||
{ "name": "radovan-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "radovan-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "radovan-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
{ "name": "radovan-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||||
{ "name": "mrtz-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "mrtz-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
|
{ "name": "mrtz-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "mrtz-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
{ "name": "mrtz-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||||
{ "name": "mrtz-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
|
{ "name": "mrtz-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "mrtz-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
|
||||||
{ "name": "mrtz-diadash.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "mrtz-diadash.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "simkir-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "simkir-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "simkir-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "simkir-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "simkir-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "simkir-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "simkir-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
{ "name": "simkir-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||||
{ "name": "simkir-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
|
|
||||||
{ "name": "simkir-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
|
||||||
{ "name": "ole-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
{ "name": "ole-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
|
{ "name": "ole-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
{ "name": "ole-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
{ "name": "ole-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||||
{ "name": "ole-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }
|
{ "name": "ole-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ grafana:
|
|||||||
{{- if .Values.prometheus.grafana.persistence }}
|
{{- if .Values.prometheus.grafana.persistence }}
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
size: 10Gi
|
size: 20Gi
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
@@ -233,7 +233,7 @@ grafana:
|
|||||||
nodeGraph:
|
nodeGraph:
|
||||||
enabled: true
|
enabled: true
|
||||||
serviceMap:
|
serviceMap:
|
||||||
datasourceUid: 'Prometheus'
|
datasourceUid: 'prometheus'
|
||||||
tracesToLogs:
|
tracesToLogs:
|
||||||
datasourceUid: loki
|
datasourceUid: loki
|
||||||
filterByTraceID: false
|
filterByTraceID: false
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||||
tag: 5db33158-debug
|
tag: 4704e4f1-debug
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/enabled: "true"
|
dapr.io/enabled: "true"
|
||||||
dapr.io/app-id: "staging-sorcerer"
|
dapr.io/app-id: "staging-sorcerer"
|
||||||
|
|||||||
Reference in New Issue
Block a user