From 80870ad127f72343ab4ac0f4beede21d2f58913b Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 13 Feb 2024 11:52:37 +0100 Subject: [PATCH] fix: simplify archmeister --- applications/archmeister.yaml | 3 --- charts/archmeister/base/kustomization.yaml | 8 ++++---- .../chart/templates/internal-ingress.yaml | 6 ++---- charts/archmeister/prod/deployment_patch.yaml | 4 ++-- charts/archmeister/prod/kustomization.yaml | 14 +++++--------- charts/archmeister/staging/deployment_patch.yaml | 4 ++-- charts/archmeister/staging/kustomization.yaml | 4 +--- charts/archmeister/values-prod.yaml | 5 ----- charts/archmeister/values-staging.yaml | 7 +------ 9 files changed, 17 insertions(+), 38 deletions(-) diff --git a/applications/archmeister.yaml b/applications/archmeister.yaml index 42f6f562..940ea824 100644 --- a/applications/archmeister.yaml +++ b/applications/archmeister.yaml @@ -37,9 +37,6 @@ spec: string: "{{ .env }}" - name: hostname string: "{{ .hostname }}" - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: dev - path: charts/archmeister/manifests templatePatch: | {{- if .autoSync }} spec: diff --git a/charts/archmeister/base/kustomization.yaml b/charts/archmeister/base/kustomization.yaml index 76ea97ac..ef31fbcb 100644 --- a/charts/archmeister/base/kustomization.yaml +++ b/charts/archmeister/base/kustomization.yaml @@ -1,17 +1,17 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -resources: -- _manifest.yaml patches: - path: deployment_patch.yaml target: group: apps kind: Deployment - name: archmeister version: v1 - path: ingress_patch.yaml target: group: networking.k8s.io kind: Ingress name: archmeister-internal - version: v1 \ No newline at end of file + annotationSelector: atlantis.oceanbox.io/expose=internal + version: v1 +resources: +- _manifest.yaml diff --git a/charts/archmeister/chart/templates/internal-ingress.yaml b/charts/archmeister/chart/templates/internal-ingress.yaml index bd83f3ec..6f1a9489 100644 --- a/charts/archmeister/chart/templates/internal-ingress.yaml +++ b/charts/archmeister/chart/templates/internal-ingress.yaml @@ -20,9 +20,7 @@ metadata: {{- include "Archmeister.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.ingress.internal.annotations }} + atlantis.oceanbox.io/expose: internal {{- toYaml . | nindent 4 }} {{- end }} spec: @@ -61,4 +59,4 @@ spec: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/archmeister/prod/deployment_patch.yaml b/charts/archmeister/prod/deployment_patch.yaml index 99f97ad8..ff2a702a 100644 --- a/charts/archmeister/prod/deployment_patch.yaml +++ b/charts/archmeister/prod/deployment_patch.yaml @@ -2,7 +2,7 @@ path: /spec/template/metadata/annotations value: dapr.io/enabled: "true" - dapr.io/app-id: "prod-archmeister" + dapr.io/app-id: "archmeister" dapr.io/app-port: "8000" dapr.io/config: "tracing" - op: add @@ -48,4 +48,4 @@ path: /spec/template/spec/containers/0/envFrom/- value: secretRef: - name: archmeister-env + name: prod-archmeister-env diff --git a/charts/archmeister/prod/kustomization.yaml b/charts/archmeister/prod/kustomization.yaml index 7348e97c..b1473965 100644 --- a/charts/archmeister/prod/kustomization.yaml +++ b/charts/archmeister/prod/kustomization.yaml @@ -1,18 +1,14 @@ -namePrefix: prod- generatorOptions: disableNameSuffixHash: true secretGenerator: -- files: +- name: archmeister-appsettings + files: - appsettings.json - name: archmeister-appsettings -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ../base patches: - path: deployment_patch.yaml target: + version: v1 group: apps kind: Deployment - name: archmeister - version: v1 +resources: +- ../base diff --git a/charts/archmeister/staging/deployment_patch.yaml b/charts/archmeister/staging/deployment_patch.yaml index 8e5ac6ef..9f926e38 100644 --- a/charts/archmeister/staging/deployment_patch.yaml +++ b/charts/archmeister/staging/deployment_patch.yaml @@ -2,7 +2,7 @@ path: /spec/template/metadata/annotations value: dapr.io/enabled: "true" - dapr.io/app-id: "staging-archmeister" + dapr.io/app-id: "archmeister" dapr.io/app-port: "8000" dapr.io/config: "tracing" - op: replace @@ -53,4 +53,4 @@ path: /spec/template/spec/containers/0/envFrom/- value: secretRef: - name: archmeister-env + name: staging-archmeister-env diff --git a/charts/archmeister/staging/kustomization.yaml b/charts/archmeister/staging/kustomization.yaml index 9a002765..c4110260 100644 --- a/charts/archmeister/staging/kustomization.yaml +++ b/charts/archmeister/staging/kustomization.yaml @@ -1,4 +1,3 @@ -namePrefix: staging- generatorOptions: disableNameSuffixHash: true secretGenerator: @@ -10,7 +9,6 @@ patches: group: apps version: v1 kind: Deployment - name: archmeister path: deployment_patch.yaml resources: - - ../base \ No newline at end of file + - ../base diff --git a/charts/archmeister/values-prod.yaml b/charts/archmeister/values-prod.yaml index f9ee393f..ded34d55 100644 --- a/charts/archmeister/values-prod.yaml +++ b/charts/archmeister/values-prod.yaml @@ -1,11 +1,6 @@ -fullnameOverride: archmeister - ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-production - internal: - annotations: - nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 cluster: backupEnabled: false diff --git a/charts/archmeister/values-staging.yaml b/charts/archmeister/values-staging.yaml index a69270a7..6996c557 100644 --- a/charts/archmeister/values-staging.yaml +++ b/charts/archmeister/values-staging.yaml @@ -1,15 +1,10 @@ -fullnameOverride: archmeister - image: tag: 04ca077a-debug ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-production - # nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 - internal: - annotations: - nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 + atlantis.oceanbox.io/expose: global cluster: backupEnabled: false