diff --git a/helm/snapshots/alpha-1.yaml b/helm/snapshots/alpha.yaml similarity index 99% rename from helm/snapshots/alpha-1.yaml rename to helm/snapshots/alpha.yaml index b3723dd..7113be7 100644 --- a/helm/snapshots/alpha-1.yaml +++ b/helm/snapshots/alpha.yaml @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/instance: release-name app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm + --- # Source: cacheppuccino-helm/templates/secret.yaml apiVersion: v1 @@ -24,6 +25,7 @@ metadata: app.kubernetes.io/managed-by: Helm type: Opaque stringData: + --- # Source: cacheppuccino-helm/templates/configmap.yaml apiVersion: v1 @@ -47,6 +49,7 @@ data: TRANSLATION_BASE_URL: "" TRANSLATION_SOURCE: "url" TRANSLATION_XLSX_URL: "https://example.com/ifrc-go/translations.xlsx" + --- # Source: cacheppuccino-helm/templates/pvc.yaml apiVersion: v1 @@ -66,6 +69,7 @@ spec: resources: requests: storage: "512Mi" + --- # Source: cacheppuccino-helm/templates/service.yaml apiVersion: v1 @@ -88,6 +92,7 @@ spec: selector: app.kubernetes.io/name: cacheppuccino-helm app.kubernetes.io/instance: release-name + --- # Source: cacheppuccino-helm/templates/deployment.yaml apiVersion: apps/v1 @@ -165,6 +170,7 @@ spec: - name: sqlite persistentVolumeClaim: claimName: release-name-cacheppuccino-helm + --- # Source: cacheppuccino-helm/templates/ingress.yaml apiVersion: networking.k8s.io/v1 @@ -178,6 +184,7 @@ metadata: app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm spec: + ingressClassName: traefik rules: - host: "cacheppuccino-alpha-1.ifrc-go.dev.togglecorp.com" http: diff --git a/helm/snapshots/production.yaml b/helm/snapshots/production.yaml index 87230dd..69bee7c 100644 --- a/helm/snapshots/production.yaml +++ b/helm/snapshots/production.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/managed-by: Helm annotations: azure.workload.identity/client-id: test_id + --- # Source: cacheppuccino-helm/templates/configmap.yaml apiVersion: v1 @@ -34,6 +35,7 @@ data: TRANSLATION_APPLICATION_ID: "18" TRANSLATION_BASE_URL: "https://ifrc-test-translationapi.azurewebsites.net" TRANSLATION_SOURCE: "api" + --- # Source: cacheppuccino-helm/templates/pvc.yaml apiVersion: v1 @@ -52,6 +54,7 @@ spec: resources: requests: storage: "512Mi" + --- # Source: cacheppuccino-helm/templates/service.yaml apiVersion: v1 @@ -74,6 +77,7 @@ spec: selector: app.kubernetes.io/name: cacheppuccino-helm app.kubernetes.io/instance: release-name + --- # Source: cacheppuccino-helm/templates/deployment.yaml apiVersion: apps/v1 @@ -161,6 +165,7 @@ spec: readOnly: true volumeAttributes: secretProviderClass: ifrcgo-cacheppuccino-secret-provider + --- # Source: cacheppuccino-helm/templates/ingress.yaml apiVersion: networking.k8s.io/v1 @@ -174,7 +179,7 @@ metadata: app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm spec: - ingressClassName: nginx + ingressClassName: traefik rules: - host: "cacheppuccino-test-prod.ifrc.org" http: @@ -190,6 +195,7 @@ spec: - secretName: cacheppuccino-helm-secret-cert-test hosts: - "cacheppuccino-test-prod.ifrc.org" + --- # Source: cacheppuccino-helm/templates/secret-provider-class.yaml apiVersion: secrets-store.csi.x-k8s.io/v1 diff --git a/helm/snapshots/staging.yaml b/helm/snapshots/staging.yaml index de185e7..a942760 100644 --- a/helm/snapshots/staging.yaml +++ b/helm/snapshots/staging.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/managed-by: Helm annotations: azure.workload.identity/client-id: test_id + --- # Source: cacheppuccino-helm/templates/configmap.yaml apiVersion: v1 @@ -34,6 +35,7 @@ data: TRANSLATION_APPLICATION_ID: "18" TRANSLATION_BASE_URL: "https://ifrc-test-translationapi.azurewebsites.net" TRANSLATION_SOURCE: "api" + --- # Source: cacheppuccino-helm/templates/pvc.yaml apiVersion: v1 @@ -52,6 +54,7 @@ spec: resources: requests: storage: "512Mi" + --- # Source: cacheppuccino-helm/templates/service.yaml apiVersion: v1 @@ -74,6 +77,7 @@ spec: selector: app.kubernetes.io/name: cacheppuccino-helm app.kubernetes.io/instance: release-name + --- # Source: cacheppuccino-helm/templates/deployment.yaml apiVersion: apps/v1 @@ -161,6 +165,7 @@ spec: readOnly: true volumeAttributes: secretProviderClass: ifrcgo-cacheppuccino-secret-provider + --- # Source: cacheppuccino-helm/templates/ingress.yaml apiVersion: networking.k8s.io/v1 @@ -174,7 +179,7 @@ metadata: app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm spec: - ingressClassName: nginx + ingressClassName: traefik rules: - host: "cacheppuccino-test-stage.ifrc.org" http: @@ -190,6 +195,7 @@ spec: - secretName: cacheppuccino-helm-secret-cert-test hosts: - "cacheppuccino-test-stage.ifrc.org" + --- # Source: cacheppuccino-helm/templates/secret-provider-class.yaml apiVersion: secrets-store.csi.x-k8s.io/v1 diff --git a/helm/tests.yaml b/helm/tests.yaml index c196141..fc6206e 100644 --- a/helm/tests.yaml +++ b/helm/tests.yaml @@ -1,8 +1,11 @@ tests: - alpha-1.yaml: [] + alpha.yaml: + - values/traefik.yaml staging.yaml: - values/go-deploy.yaml - values/staging.yaml + - values/traefik.yaml production.yaml: - values/go-deploy.yaml - values/production.yaml + - values/traefik.yaml diff --git a/helm/tests/alpha-1.yaml b/helm/tests/alpha.yaml similarity index 100% rename from helm/tests/alpha-1.yaml rename to helm/tests/alpha.yaml diff --git a/helm/tests/production.yaml b/helm/tests/production.yaml index c9e9aaf..92ae70e 100644 --- a/helm/tests/production.yaml +++ b/helm/tests/production.yaml @@ -1,7 +1,6 @@ # NOTE: test data for production, using values production.yaml ingress: host: cacheppuccino-test-prod.ifrc.org - className: nginx tls: enabled: true secretName: cacheppuccino-helm-secret-cert-test diff --git a/helm/tests/staging.yaml b/helm/tests/staging.yaml index 0f422b9..11fc701 100644 --- a/helm/tests/staging.yaml +++ b/helm/tests/staging.yaml @@ -1,7 +1,6 @@ # NOTE: test data for staging, using values staging.yaml ingress: host: cacheppuccino-test-stage.ifrc.org - className: nginx tls: enabled: true secretName: cacheppuccino-helm-secret-cert-test diff --git a/helm/values/traefik.yaml b/helm/values/traefik.yaml new file mode 100644 index 0000000..097816d --- /dev/null +++ b/helm/values/traefik.yaml @@ -0,0 +1,2 @@ +ingress: + className: traefik