diff --git a/helmfile.d/docs.yaml.gotmpl b/helmfile.d/docs.yaml.gotmpl index ee8ee0a7..ae2258f7 100644 --- a/helmfile.d/docs.yaml.gotmpl +++ b/helmfile.d/docs.yaml.gotmpl @@ -6,7 +6,7 @@ commonLabels: releases: - name: docs - namespace: {{ .Environment.Name }}-docs + namespace: docs chart: ../charts/docs condition: docs.enabled values: diff --git a/values/docs/env-hel1.yaml.gotmpl b/values/docs/env-hel1.yaml.gotmpl new file mode 100644 index 00000000..6bca4aeb --- /dev/null +++ b/values/docs/env-hel1.yaml.gotmpl @@ -0,0 +1,2 @@ +docs: + enabled: true diff --git a/values/docs/env-oceanbox.yaml.gotmpl b/values/docs/env-oceanbox.yaml.gotmpl index 6bca4aeb..4535a6b7 100644 --- a/values/docs/env-oceanbox.yaml.gotmpl +++ b/values/docs/env-oceanbox.yaml.gotmpl @@ -1,2 +1,2 @@ docs: - enabled: true + enabled: false diff --git a/values/docs/manifests/docs.yaml b/values/docs/manifests/docs.yaml index 714e1b12..9fb9b46b 100644 --- a/values/docs/manifests/docs.yaml +++ b/values/docs/manifests/docs.yaml @@ -2,7 +2,7 @@ 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,7 +11,7 @@ metadata: - resources-finalizer.argocd.argoproj.io spec: destination: - namespace: {{ .Values.docs.env }}-docs + namespace: docs server: https://kubernetes.default.svc project: default sources: @@ -24,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: diff --git a/values/docs/values/values-prod.yaml b/values/docs/values/values-prod.yaml deleted file mode 100644 index 6584e42b..00000000 --- a/values/docs/values/values-prod.yaml +++ /dev/null @@ -1,25 +0,0 @@ -replicaCount: 1 -env: - - name: APP_VERSION - value: "1.5.0" - - name: LOG_LEVEL - value: "2" -ingress: - enabled: true - className: "nginx" - annotations: - cert-manager.io/cluster-issuer: letsencrypt-production - nginx.ingress.kubernetes.io/backend-protocol: HTTP - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-buffer-size: 128k - nginx.ingress.kubernetes.io/ssl-redirect: "true" - oceanbox.io/expose: internal - hosts: - - host: docs.oceanbox.io - paths: - - path: / - pathType: ImplementationSpecific - tls: - - hosts: - - docs.oceanbox.io - secretName: docs-tls diff --git a/values/docs/values/values-staging.yaml b/values/docs/values/values-staging.yaml index d4b38e58..7fa105a1 100644 --- a/values/docs/values/values-staging.yaml +++ b/values/docs/values/values-staging.yaml @@ -3,7 +3,7 @@ image: tag: "5c4cda2e-debug" env: - name: APP_VERSION - value: "0.0.0-staging" + value: "0.0.0" - name: LOG_LEVEL value: "1" ingress: @@ -17,11 +17,11 @@ ingress: nginx.ingress.kubernetes.io/ssl-redirect: "true" oceanbox.io/expose: internal hosts: - - host: docs.dev.oceanbox.io + - host: docs.oceanbox.io paths: - path: / pathType: ImplementationSpecific tls: - hosts: - - docs.dev.oceanbox.io - secretName: staging-docs-tls + - docs.oceanbox.io + secretName: docs-tls