Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 256b7b9539 |
@@ -13,7 +13,7 @@ applications:
|
||||
server: https://kubernetes.default.svc
|
||||
project: sys
|
||||
sources:
|
||||
- repoURL: https://git.oceanbox.io/platform/manifests.git
|
||||
- repoURL: https://gitlab.com/oceanbox//manifests.git
|
||||
targetRevision: HEAD
|
||||
path: helmfile.d
|
||||
plugin:
|
||||
|
||||
@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
|
||||
type: application
|
||||
# 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.
|
||||
version: v1.42.27
|
||||
version: v2.11.0
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v1.42.27
|
||||
appVersion: v2.11.0
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: v1.42.27
|
||||
tag: v2.11.0
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
|
||||
@@ -13,9 +13,9 @@ type: application
|
||||
# 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.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: v1.42.27
|
||||
version: v2.11.0
|
||||
# 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
|
||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||
# It is recommended to use it with quotes.
|
||||
appVersion: "v1.42.27"
|
||||
appVersion: "v2.11.0"
|
||||
|
||||
@@ -10,7 +10,7 @@ image:
|
||||
# This sets the pull policy for images.
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
tag: v1.42.27
|
||||
tag: v2.11.0
|
||||
# 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:
|
||||
- name: gitlab-pull-secret
|
||||
|
||||
@@ -12,7 +12,7 @@ description: Oceanbox Documentation
|
||||
type: application
|
||||
# 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.
|
||||
version: v0.0.1
|
||||
version: v0.1.0
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v0.0.1
|
||||
appVersion: v0.1.0
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/documentation/docs
|
||||
tag: v0.0.1
|
||||
tag: v0.1.0
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
@@ -21,9 +21,8 @@ env:
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
# imagePullSecrets:
|
||||
# - name: gitea-pull-secret
|
||||
|
||||
# imagePullSecrets:
|
||||
# - name: gitea-pull-secret
|
||||
nameOverride: ""
|
||||
fullnameOverride: ""
|
||||
serviceAccount:
|
||||
|
||||
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
|
||||
type: application
|
||||
# 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.
|
||||
version: v1.42.27
|
||||
version: v2.11.0
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v1.42.27
|
||||
appVersion: v2.11.0
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||
tag: v1.42.27
|
||||
tag: v2.11.0
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: argocd
|
||||
namespace: argocd
|
||||
chart: argo/argo-cd
|
||||
version: 9.5.19
|
||||
version: 9.5.17
|
||||
condition: argo.enabled
|
||||
values:
|
||||
- ../values/argo/values/argocd.yaml.gotmpl
|
||||
@@ -35,7 +35,7 @@ releases:
|
||||
- name: argo-rollouts
|
||||
namespace: argocd
|
||||
chart: argo/argo-rollouts
|
||||
version: 2.41.0
|
||||
version: 2.40.10
|
||||
condition: argo.rollouts.enabled
|
||||
values:
|
||||
- ../values/argo/values/rollouts.yaml.gotmpl
|
||||
|
||||
@@ -16,7 +16,7 @@ releases:
|
||||
namespace: {{ .Environment.Name }}-openfga
|
||||
{{- end }}
|
||||
chart: openfga/openfga
|
||||
version: 0.3.7
|
||||
version: 0.3.5
|
||||
condition: openfga.enabled
|
||||
values:
|
||||
- ../values/openfga/values/values.yaml
|
||||
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: opentelemetry-collector
|
||||
namespace: otel
|
||||
chart: open-telemetry/opentelemetry-collector
|
||||
version: 0.158.1
|
||||
version: 0.156.2
|
||||
condition: otel.enabled
|
||||
values:
|
||||
- ../values/opentelemetry-collector/values/values.yaml
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: prometheus
|
||||
namespace: prometheus
|
||||
chart: prometheus/kube-prometheus-stack
|
||||
version: 85.3.0
|
||||
version: 85.4.0
|
||||
condition: prometheus.enabled
|
||||
values:
|
||||
- ../values/prometheus/values/prometheus.yaml.gotmpl
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: velero
|
||||
namespace: velero
|
||||
chart: velero/velero
|
||||
version: 12.0.2
|
||||
version: 12.0.1
|
||||
condition: velero.enabled
|
||||
values:
|
||||
- ../values/velero/values/velero.yaml.gotmpl
|
||||
|
||||
@@ -109,7 +109,7 @@ spec:
|
||||
- https://kubernetes-sigs.github.io/metrics-server/
|
||||
- https://git.oceanbox.io/platform/manifests.git
|
||||
- https://git.oceanbox.io/platform/manifests
|
||||
- https://git.oceanbox.io/oceanbox/manifests.git
|
||||
- https://gitlab.com/oceanbox/manifests.git
|
||||
- https://kubernetes.github.io/ingress-nginx
|
||||
- https://cloudnative-pg.github.io/charts
|
||||
- https://charts.jetstack.io
|
||||
|
||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
||||
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: v2.13.1
|
||||
tag: v2.10.0
|
||||
|
||||
podAnnotations:
|
||||
dapr.io/app-id: "beta-atlantis"
|
||||
@@ -11,7 +11,7 @@ env:
|
||||
- name: APP_NAMESPACE
|
||||
value: beta-atlantis
|
||||
- name: APP_VERSION
|
||||
value: "2.13.1-beta"
|
||||
value: "2.10.0-beta"
|
||||
- name: LOG_LEVEL
|
||||
value: "1"
|
||||
- name: ANALYTICS_WEB_ID
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: 4733e529-debug
|
||||
tag: acc3745a-debug
|
||||
podAnnotations:
|
||||
dapr.io/app-id: "staging-atlantis"
|
||||
env:
|
||||
|
||||
@@ -38,4 +38,4 @@ volumeMounts:
|
||||
readOnly: true
|
||||
subPath: appsettings.json
|
||||
image:
|
||||
tag: 4704e4f1-debug
|
||||
tag: acc3745a-debug
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{{- if .Values.clusterConfig.argo.enabled }}
|
||||
{{ if .Values.clusterConfig.argo.enabled }}
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: {{ .Values.docs.env }}-docs
|
||||
name: docs
|
||||
namespace: argocd
|
||||
annotations:
|
||||
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
|
||||
@@ -11,11 +11,7 @@ metadata:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
spec:
|
||||
destination:
|
||||
{{- if eq .Values.docs.env "prod" }}
|
||||
namespace: docs
|
||||
{{- else }}
|
||||
namespace: {{ .Values.docs.env }}-docs
|
||||
{{- end }}
|
||||
server: https://kubernetes.default.svc
|
||||
project: default
|
||||
sources:
|
||||
@@ -28,7 +24,7 @@ spec:
|
||||
- name: CLUSTER_NAME
|
||||
value: {{ .Values.clusterConfig.cluster }}
|
||||
- name: HELMFILE_ENVIRONMENT
|
||||
value: {{ .Values.docs.env }}
|
||||
value: default
|
||||
- name: HELMFILE_FILE_PATH
|
||||
value: docs.yaml.gotmpl
|
||||
syncPolicy:
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
fullnameOverride: prod-docs
|
||||
|
||||
ingress:
|
||||
enabled: true
|
||||
className: "haproxy"
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||
haproxy.org/backend-protocol: h1
|
||||
haproxy.org/cors-enable: "true"
|
||||
oceanbox.io/expose: internal
|
||||
hosts:
|
||||
- host: docs.oceanbox.io
|
||||
paths:
|
||||
- path: /
|
||||
pathType: ImplementationSpecific
|
||||
tls:
|
||||
- hosts:
|
||||
- docs.oceanbox.io
|
||||
secretName: prod-docs-tls
|
||||
@@ -1,20 +0,0 @@
|
||||
fullnameOverride: staging-docs
|
||||
image:
|
||||
tag: "4bec2e8e-debug"
|
||||
ingress:
|
||||
enabled: true
|
||||
className: "haproxy"
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: ca-issuer
|
||||
haproxy.org/backend-protocol: h1
|
||||
haproxy.org/cors-enable: "true"
|
||||
oceanbox.io/expose: internal
|
||||
hosts:
|
||||
- host: docs.dev.hel1.obx
|
||||
paths:
|
||||
- path: /
|
||||
pathType: ImplementationSpecific
|
||||
tls:
|
||||
- hosts:
|
||||
- docs.dev.hel1.obx
|
||||
secretName: default-docs-tls
|
||||
@@ -1,6 +1,25 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
tag: "cdfdc59d-debug"
|
||||
env:
|
||||
- name: APP_VERSION
|
||||
value: "0.0.0"
|
||||
- name: LOG_LEVEL
|
||||
value: "1"
|
||||
ingress:
|
||||
enabled: true
|
||||
className: "haproxy"
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||
haproxy.org/backend-protocol: h1
|
||||
haproxy.org/cors-enable: "true"
|
||||
oceanbox.io/expose: internal
|
||||
hosts:
|
||||
- host: docs.oceanbox.io
|
||||
paths:
|
||||
- path: /
|
||||
pathType: ImplementationSpecific
|
||||
tls:
|
||||
- hosts:
|
||||
- docs.oceanbox.io
|
||||
secretName: docs-tls
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
clusterConfig:
|
||||
manifests: https://git.oceanbox.io/platform/manifests.git
|
||||
manifests: https://gitlab.com/oceanbox/manifests.git
|
||||
env: "" #[dev, test, staging, prod]
|
||||
initca: ""
|
||||
domain: ".local"
|
||||
|
||||
@@ -272,14 +272,6 @@ configMaps:
|
||||
{ "action": "accept", "src": [ "hanskristian.djuve@oceanbox.io" ], "dst": [ "hanskristian.djuve@oceanbox.io:*" ] },
|
||||
{ "action": "accept", "src": [ "erlend.mundal@oceanbox.io" ], "dst": [ "erlend.mundal@oceanbox.io:*" ] },
|
||||
// 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:
|
||||
@@ -311,6 +303,7 @@ configMaps:
|
||||
{ "name": "cache.srv.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
{ "name": "makai.srv.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
{ "name": "makai.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
{ "name": "docs.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
|
||||
{ "name": "slurm.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
{ "name": "slurm-gateway.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
@@ -330,7 +323,6 @@ configMaps:
|
||||
{ "name": "git.oceanbox.io", "type": "A", "value": "10.0.1.3" },
|
||||
{ "name": "makai.oceanbox.io", "type": "A", "value": "10.0.1.3" },
|
||||
{ "name": "docs.oceanbox.io", "type": "A", "value": "10.0.1.3" },
|
||||
{ "name": "docs.dev.oceanbox.io", "type": "A", "value": "10.0.1.3" },
|
||||
|
||||
{ "name": "kueue.dev.tos.obx", "type": "A", "value": "10.255.241.99" },
|
||||
{ "name": "slurm-agent.rossby.oceanbox.io", "type": "A", "value": "172.16.239.222" },
|
||||
@@ -367,21 +359,25 @@ configMaps:
|
||||
|
||||
{ "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-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-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-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-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-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
|
||||
{ "name": "mrtz-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
|
||||
{ "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": "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-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.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-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-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }
|
||||
{ "name": "ole-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }
|
||||
]
|
||||
|
||||
@@ -167,7 +167,7 @@ grafana:
|
||||
{{- if .Values.prometheus.grafana.persistence }}
|
||||
persistence:
|
||||
enabled: true
|
||||
size: 20Gi
|
||||
size: 10Gi
|
||||
{{- end }}
|
||||
ingress:
|
||||
enabled: true
|
||||
@@ -233,7 +233,7 @@ grafana:
|
||||
nodeGraph:
|
||||
enabled: true
|
||||
serviceMap:
|
||||
datasourceUid: 'prometheus'
|
||||
datasourceUid: 'Prometheus'
|
||||
tracesToLogs:
|
||||
datasourceUid: loki
|
||||
filterByTraceID: false
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||
tag: 4704e4f1-debug
|
||||
tag: 5db33158-debug
|
||||
podAnnotations:
|
||||
dapr.io/enabled: "true"
|
||||
dapr.io/app-id: "staging-sorcerer"
|
||||
|
||||
Reference in New Issue
Block a user