From 4034139a4b27d7c0546f4a78e9aa0ea0febc6e35 Mon Sep 17 00:00:00 2001 From: Antoine Arlaud Date: Sat, 25 Nov 2023 00:23:42 +0100 Subject: [PATCH] fix: require the right input items for the right crType --- charts/snyk-broker/Chart.yaml | 2 +- .../templates/broker_deployment.yaml | 8 + ..._deployment_disablesuffixes_test.yaml.snap | 22 +-- .../broker_cra_deployment_test.yaml.snap | 22 +-- .../broker_deployment_apprisk_test.yaml.snap | 6 +- ...t_configmap_disablesuffixes_test.yaml.snap | 16 +- ...broker_deployment_configmap_test.yaml.snap | 16 +- ...ustomaccept_disablesuffixes_test.yaml.snap | 8 +- ...ker_deployment_customaccept_test.yaml.snap | 8 +- ..._deployment_disablesuffixes_test.yaml.snap | 24 +-- ...ent_ingress_disablesuffixes_test.yaml.snap | 8 +- .../broker_deployment_ingress_test.yaml.snap | 8 +- .../broker_deployment_test.yaml.snap | 24 +-- ...cra_deployment_digitalocean_test.yaml.snap | 168 +++++++++++++++++ ..._deployment_disablesuffixes_test.yaml.snap | 103 ++++++++++- .../cra_deployment_harbor_test.yaml.snap | 170 ++++++++++++++++++ .../cra_deployment_test.yaml.snap | 103 ++++++++++- .../cra_deployment_digitalocean_test.yaml | 11 ++ .../cra_deployment_disablesuffixes_test.yaml | 1 + .../tests/cra_deployment_harbor_test.yaml | 11 ++ .../tests/cra_deployment_test.yaml | 1 + .../tests/fixtures/default_values_cra.yaml | 2 + .../default_values_cra_digital_ocean.yaml | 30 ++++ .../default_values_cra_disablesuffixes.yaml | 2 + .../fixtures/default_values_cra_harbor.yaml | 32 ++++ 25 files changed, 706 insertions(+), 100 deletions(-) create mode 100644 charts/snyk-broker/tests/__snapshot__/cra_deployment_digitalocean_test.yaml.snap create mode 100644 charts/snyk-broker/tests/__snapshot__/cra_deployment_harbor_test.yaml.snap create mode 100644 charts/snyk-broker/tests/cra_deployment_digitalocean_test.yaml create mode 100644 charts/snyk-broker/tests/cra_deployment_harbor_test.yaml create mode 100644 charts/snyk-broker/tests/fixtures/default_values_cra_digital_ocean.yaml create mode 100644 charts/snyk-broker/tests/fixtures/default_values_cra_harbor.yaml diff --git a/charts/snyk-broker/Chart.yaml b/charts/snyk-broker/Chart.yaml index c5fc22f..7cf23b6 100644 --- a/charts/snyk-broker/Chart.yaml +++ b/charts/snyk-broker/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 name: snyk-broker -version: 2.3.0 +version: 2.4.0 description: A Helm chart for Kubernetes type: application diff --git a/charts/snyk-broker/templates/broker_deployment.yaml b/charts/snyk-broker/templates/broker_deployment.yaml index b93279b..60ade4b 100644 --- a/charts/snyk-broker/templates/broker_deployment.yaml +++ b/charts/snyk-broker/templates/broker_deployment.yaml @@ -292,8 +292,11 @@ spec: value: http://cra-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}:{{ .Values.deployment.container.crSnykPort | toString }} - name: CR_TYPE value: {{ .Values.crType }} + {{- if not (has .Values.crType (list "ecr")) }} - name: CR_BASE value: {{ .Values.crBase }} + {{- end }} + {{- if not (has .Values.crType (list "ecr" "digitalocean-cr")) }} - name: CR_USERNAME value: {{ .Values.crUsername }} - name: CR_PASSWORD @@ -301,17 +304,22 @@ spec: secretKeyRef: name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" + {{- end }} + {{- if has .Values.crType (list "digitalocean-cr") }} - name: CR_TOKEN valueFrom: secretKeyRef: name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" + {{- end }} + {{- if has .Values.crType (list "ecr") }} - name: CR_ROLE_ARN value: {{ .Values.crRoleArn }} - name: CR_REGION value: {{ .Values.crRegion }} - name: CR_EXTERNAL_ID value: {{ .Values.crExternalId }} + {{- end }} - name: PORT value: {{ .Values.deployment.container.containerPort | squote }} - name: BROKER_CLIENT_URL diff --git a/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_disablesuffixes_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_disablesuffixes_test.yaml.snap index 6eaf230..52ac635 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_disablesuffixes_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_disablesuffixes_test.yaml.snap @@ -7,7 +7,7 @@ with CRA: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: container-registry-agent-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -38,21 +38,7 @@ with CRA: - name: CR_AGENT_URL value: http://cra-service-RELEASE-NAME:8081 - name: CR_TYPE - value: null - - name: CR_BASE - value: null - - name: CR_USERNAME - value: null - - name: CR_PASSWORD - valueFrom: - secretKeyRef: - key: container-registry-agent-token-key - name: container-registry-agent-token-RELEASE-NAME - - name: CR_TOKEN - valueFrom: - secretKeyRef: - key: container-registry-agent-token-key - name: container-registry-agent-token-RELEASE-NAME + value: ecr - name: CR_ROLE_ARN value: arn:aws-us-gov:iam::123456789012:role - name: CR_REGION @@ -120,7 +106,7 @@ with CRA: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: container-registry-agent-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -147,6 +133,6 @@ with CRA: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_test.yaml.snap index 6eaf230..52ac635 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_test.yaml.snap @@ -7,7 +7,7 @@ with CRA: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: container-registry-agent-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -38,21 +38,7 @@ with CRA: - name: CR_AGENT_URL value: http://cra-service-RELEASE-NAME:8081 - name: CR_TYPE - value: null - - name: CR_BASE - value: null - - name: CR_USERNAME - value: null - - name: CR_PASSWORD - valueFrom: - secretKeyRef: - key: container-registry-agent-token-key - name: container-registry-agent-token-RELEASE-NAME - - name: CR_TOKEN - valueFrom: - secretKeyRef: - key: container-registry-agent-token-key - name: container-registry-agent-token-RELEASE-NAME + value: ecr - name: CR_ROLE_ARN value: arn:aws-us-gov:iam::123456789012:role - name: CR_REGION @@ -120,7 +106,7 @@ with CRA: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: container-registry-agent-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -147,6 +133,6 @@ with CRA: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_apprisk_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_apprisk_test.yaml.snap index f0babcb..0638143 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_apprisk_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_apprisk_test.yaml.snap @@ -7,7 +7,7 @@ apprisk enabled: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -105,7 +105,7 @@ apprisk enabled: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -132,6 +132,6 @@ apprisk enabled: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_disablesuffixes_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_disablesuffixes_test.yaml.snap index 664f16b..0048fdc 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_disablesuffixes_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_disablesuffixes_test.yaml.snap @@ -7,7 +7,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -113,7 +113,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -155,7 +155,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-cacert-configmap namespace: NAMESPACE 4: | @@ -174,7 +174,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE cacertfile: @@ -186,7 +186,7 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -282,7 +282,7 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -303,7 +303,7 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-cacert-configmap namespace: NAMESPACE 4: | @@ -322,6 +322,6 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_test.yaml.snap index 526d66e..87f54a9 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_test.yaml.snap @@ -7,7 +7,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -113,7 +113,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -155,7 +155,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-cacert-configmap-RELEASE-NAME namespace: NAMESPACE 4: | @@ -174,7 +174,7 @@ cacert: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE cacertfile: @@ -186,7 +186,7 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -282,7 +282,7 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -303,7 +303,7 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-cacert-configmap-RELEASE-NAME namespace: NAMESPACE 4: | @@ -322,6 +322,6 @@ cacertfile: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_disablesuffixes_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_disablesuffixes_test.yaml.snap index 958cb1b..272a4a9 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_disablesuffixes_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_disablesuffixes_test.yaml.snap @@ -9,7 +9,7 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-accept-configmap namespace: NAMESPACE 2: | @@ -20,7 +20,7 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -120,7 +120,7 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -147,6 +147,6 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_test.yaml.snap index 5d896e5..160a940 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_test.yaml.snap @@ -9,7 +9,7 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-accept-configmap-RELEASE-NAME namespace: NAMESPACE 2: | @@ -20,7 +20,7 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -120,7 +120,7 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -147,6 +147,6 @@ customaccept values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_disablesuffixes_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_disablesuffixes_test.yaml.snap index 81f3a43..cdb0f1a 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_disablesuffixes_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_disablesuffixes_test.yaml.snap @@ -7,7 +7,7 @@ HA mode on: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -105,7 +105,7 @@ HA mode on: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -132,7 +132,7 @@ HA mode on: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE HA mode on with 4 replicas: @@ -144,7 +144,7 @@ HA mode on with 4 replicas: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -242,7 +242,7 @@ HA mode on with 4 replicas: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -269,7 +269,7 @@ HA mode on with 4 replicas: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE default values: @@ -281,7 +281,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -377,7 +377,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -404,7 +404,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE preflight checks off: @@ -416,7 +416,7 @@ preflight checks off: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -514,7 +514,7 @@ preflight checks off: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -541,6 +541,6 @@ preflight checks off: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_disablesuffixes_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_disablesuffixes_test.yaml.snap index 730d7dd..a4db2a6 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_disablesuffixes_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_disablesuffixes_test.yaml.snap @@ -7,7 +7,7 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker namespace: NAMESPACE spec: @@ -103,7 +103,7 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker namespace: NAMESPACE spec: @@ -123,7 +123,7 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service namespace: NAMESPACE spec: @@ -150,6 +150,6 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_test.yaml.snap index b21e662..a2ac906 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_test.yaml.snap @@ -7,7 +7,7 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -103,7 +103,7 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: RELEASE-NAME-snyk-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -123,7 +123,7 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -150,6 +150,6 @@ ingress: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/broker_deployment_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/broker_deployment_test.yaml.snap index 31e19e4..8c2d338 100644 --- a/charts/snyk-broker/tests/__snapshot__/broker_deployment_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_test.yaml.snap @@ -7,7 +7,7 @@ HA mode on: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -105,7 +105,7 @@ HA mode on: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -132,7 +132,7 @@ HA mode on: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE HA mode on with 4 replicas: @@ -144,7 +144,7 @@ HA mode on with 4 replicas: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -242,7 +242,7 @@ HA mode on with 4 replicas: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -269,7 +269,7 @@ HA mode on with 4 replicas: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE default values: @@ -281,7 +281,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -377,7 +377,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -404,7 +404,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE preflight checks off: @@ -416,7 +416,7 @@ preflight checks off: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -514,7 +514,7 @@ preflight checks off: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -541,6 +541,6 @@ preflight checks off: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE diff --git a/charts/snyk-broker/tests/__snapshot__/cra_deployment_digitalocean_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/cra_deployment_digitalocean_test.yaml.snap new file mode 100644 index 0000000..c46c5a6 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/cra_deployment_digitalocean_test.yaml.snap @@ -0,0 +1,168 @@ +default values: + 1: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + helm.sh/chart: snyk-broker-2.4.0 + name: container-registry-agent-broker-RELEASE-NAME + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + spec: + containers: + - env: + - name: BROKER_SERVER_URL + value: https://broker.test.snyk.io + - name: BROKER_HEALTHCHECK_PATH + value: /healthcheck + - name: BROKER_SYSTEMCHECK_PATH + value: /systemcheck + - name: BROKER_TOKEN + valueFrom: + secretKeyRef: + key: container-registry-agent-broker-token-key + name: container-registry-agent-broker-token-RELEASE-NAME + - name: CR_AGENT_URL + value: http://cra-service-RELEASE-NAME:8081 + - name: CR_TYPE + value: digitalocean-cr + - name: CR_BASE + value: digitaloceanbase + - name: CR_TOKEN + valueFrom: + secretKeyRef: + key: container-registry-agent-token-key + name: container-registry-agent-token-RELEASE-NAME + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://container-registry-agent-broker-service-RELEASE-NAME:8000 + - name: BROKER_CLIENT_VALIDATION_URL + value: http://cra-service-RELEASE-NAME:8081/healthcheck + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:container-registry-agent + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: container-registry-agent-broker-RELEASE-NAME + ports: + - containerPort: 8000 + name: http + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + resources: + limits: + cpu: 1 + memory: 256Mi + requests: + cpu: 1 + memory: 256Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 1000 + volumeMounts: null + securityContext: {} + serviceAccountName: snyk-broker-RELEASE-NAME + volumes: null + 2: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + name: container-registry-agent-cra-RELEASE-NAME + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + spec: + containers: + - env: + - name: SNYK_PORT + value: "8081" + image: snyk/container-registry-agent:latest + imagePullPolicy: Always + name: container-registry-agent-RELEASE-NAME + ports: + - containerPort: 8081 + name: http + resources: + limits: + cpu: 1 + memory: 2Gi + requests: + cpu: 1 + memory: 2Gi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: false + runAsNonRoot: true + runAsUser: 1000 + securityContext: {} + serviceAccountName: snyk-broker-RELEASE-NAME + 3: | + apiVersion: v1 + kind: Service + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + helm.sh/chart: snyk-broker-2.4.0 + name: cra-service-RELEASE-NAME + namespace: NAMESPACE + spec: + ports: + - port: 8081 + targetPort: 8081 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + type: ClusterIP diff --git a/charts/snyk-broker/tests/__snapshot__/cra_deployment_disablesuffixes_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/cra_deployment_disablesuffixes_test.yaml.snap index d71f90b..e2c6546 100644 --- a/charts/snyk-broker/tests/__snapshot__/cra_deployment_disablesuffixes_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/cra_deployment_disablesuffixes_test.yaml.snap @@ -1,5 +1,104 @@ default values: 1: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: snyk-broker + helm.sh/chart: snyk-broker-2.4.0 + name: container-registry-agent-broker + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + spec: + containers: + - env: + - name: BROKER_SERVER_URL + value: https://broker.test.snyk.io + - name: BROKER_HEALTHCHECK_PATH + value: /healthcheck + - name: BROKER_SYSTEMCHECK_PATH + value: /systemcheck + - name: BROKER_TOKEN + valueFrom: + secretKeyRef: + key: container-registry-agent-broker-token-key + name: container-registry-agent-broker-token + - name: CR_AGENT_URL + value: http://cra-service:8081 + - name: CR_TYPE + value: ecr + - name: CR_ROLE_ARN + value: arn:aws-us-gov:iam::123456789012:role + - name: CR_REGION + value: eu-west + - name: CR_EXTERNAL_ID + value: 11111111-1111-1111-1111-111111111111 + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://container-registry-agent-broker-service:8000 + - name: BROKER_CLIENT_VALIDATION_URL + value: http://cra-service:8081/healthcheck + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:container-registry-agent + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: container-registry-agent-broker + ports: + - containerPort: 8000 + name: http + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + resources: + limits: + cpu: 1 + memory: 256Mi + requests: + cpu: 1 + memory: 256Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 1000 + volumeMounts: null + securityContext: {} + serviceAccountName: snyk-broker + volumes: null + 2: | apiVersion: apps/v1 kind: Deployment metadata: @@ -47,7 +146,7 @@ default values: runAsUser: 1000 securityContext: {} serviceAccountName: snyk-broker - 2: | + 3: | apiVersion: v1 kind: Service metadata: @@ -55,7 +154,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: cra-service namespace: NAMESPACE spec: diff --git a/charts/snyk-broker/tests/__snapshot__/cra_deployment_harbor_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/cra_deployment_harbor_test.yaml.snap new file mode 100644 index 0000000..c060300 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/cra_deployment_harbor_test.yaml.snap @@ -0,0 +1,170 @@ +default values: + 1: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + helm.sh/chart: snyk-broker-2.4.0 + name: container-registry-agent-broker-RELEASE-NAME + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + spec: + containers: + - env: + - name: BROKER_SERVER_URL + value: https://broker.test.snyk.io + - name: BROKER_HEALTHCHECK_PATH + value: /healthcheck + - name: BROKER_SYSTEMCHECK_PATH + value: /systemcheck + - name: BROKER_TOKEN + valueFrom: + secretKeyRef: + key: container-registry-agent-broker-token-key + name: container-registry-agent-broker-token-RELEASE-NAME + - name: CR_AGENT_URL + value: http://cra-service-RELEASE-NAME:8081 + - name: CR_TYPE + value: harbor + - name: CR_BASE + value: crBaseValue + - name: CR_USERNAME + value: myusername + - name: CR_PASSWORD + valueFrom: + secretKeyRef: + key: container-registry-agent-token-key + name: container-registry-agent-token-RELEASE-NAME + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://container-registry-agent-broker-service-RELEASE-NAME:8000 + - name: BROKER_CLIENT_VALIDATION_URL + value: http://cra-service-RELEASE-NAME:8081/healthcheck + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:container-registry-agent + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: container-registry-agent-broker-RELEASE-NAME + ports: + - containerPort: 8000 + name: http + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + resources: + limits: + cpu: 1 + memory: 256Mi + requests: + cpu: 1 + memory: 256Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 1000 + volumeMounts: null + securityContext: {} + serviceAccountName: snyk-broker-RELEASE-NAME + volumes: null + 2: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + name: container-registry-agent-cra-RELEASE-NAME + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + spec: + containers: + - env: + - name: SNYK_PORT + value: "8081" + image: snyk/container-registry-agent:latest + imagePullPolicy: Always + name: container-registry-agent-RELEASE-NAME + ports: + - containerPort: 8081 + name: http + resources: + limits: + cpu: 1 + memory: 2Gi + requests: + cpu: 1 + memory: 2Gi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: false + runAsNonRoot: true + runAsUser: 1000 + securityContext: {} + serviceAccountName: snyk-broker-RELEASE-NAME + 3: | + apiVersion: v1 + kind: Service + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + helm.sh/chart: snyk-broker-2.4.0 + name: cra-service-RELEASE-NAME + namespace: NAMESPACE + spec: + ports: + - port: 8081 + targetPort: 8081 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr-RELEASE-NAME + type: ClusterIP diff --git a/charts/snyk-broker/tests/__snapshot__/cra_deployment_test.yaml.snap b/charts/snyk-broker/tests/__snapshot__/cra_deployment_test.yaml.snap index 451f1f9..8944a7c 100644 --- a/charts/snyk-broker/tests/__snapshot__/cra_deployment_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/cra_deployment_test.yaml.snap @@ -1,5 +1,104 @@ default values: 1: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + helm.sh/chart: snyk-broker-2.4.0 + name: container-registry-agent-broker-RELEASE-NAME + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + spec: + containers: + - env: + - name: BROKER_SERVER_URL + value: https://broker.test.snyk.io + - name: BROKER_HEALTHCHECK_PATH + value: /healthcheck + - name: BROKER_SYSTEMCHECK_PATH + value: /systemcheck + - name: BROKER_TOKEN + valueFrom: + secretKeyRef: + key: container-registry-agent-broker-token-key + name: container-registry-agent-broker-token-RELEASE-NAME + - name: CR_AGENT_URL + value: http://cra-service-RELEASE-NAME:8081 + - name: CR_TYPE + value: ecr + - name: CR_ROLE_ARN + value: arn:aws-us-gov:iam::123456789012:role + - name: CR_REGION + value: eu-west + - name: CR_EXTERNAL_ID + value: 11111111-1111-1111-1111-111111111111 + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://container-registry-agent-broker-service-RELEASE-NAME:8000 + - name: BROKER_CLIENT_VALIDATION_URL + value: http://cra-service-RELEASE-NAME:8081/healthcheck + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:container-registry-agent + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: container-registry-agent-broker-RELEASE-NAME + ports: + - containerPort: 8000 + name: http + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + resources: + limits: + cpu: 1 + memory: 256Mi + requests: + cpu: 1 + memory: 256Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 1000 + volumeMounts: null + securityContext: {} + serviceAccountName: snyk-broker-RELEASE-NAME + volumes: null + 2: | apiVersion: apps/v1 kind: Deployment metadata: @@ -47,7 +146,7 @@ default values: runAsUser: 1000 securityContext: {} serviceAccountName: snyk-broker-RELEASE-NAME - 2: | + 3: | apiVersion: v1 kind: Service metadata: @@ -55,7 +154,7 @@ default values: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: snyk-broker-RELEASE-NAME - helm.sh/chart: snyk-broker-2.3.0 + helm.sh/chart: snyk-broker-2.4.0 name: cra-service-RELEASE-NAME namespace: NAMESPACE spec: diff --git a/charts/snyk-broker/tests/cra_deployment_digitalocean_test.yaml b/charts/snyk-broker/tests/cra_deployment_digitalocean_test.yaml new file mode 100644 index 0000000..628eabf --- /dev/null +++ b/charts/snyk-broker/tests/cra_deployment_digitalocean_test.yaml @@ -0,0 +1,11 @@ +suite: test broker deployment +templates: + - cra_deployment.yaml + - broker_deployment.yaml + +tests: + - it: default values + values: + - ./fixtures/default_values_cra_digital_ocean.yaml + asserts: + - matchSnapshot: {} \ No newline at end of file diff --git a/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml b/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml index 31ed2c3..89c94c5 100644 --- a/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml +++ b/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml @@ -1,6 +1,7 @@ suite: test broker deployment (No suffixes) templates: - cra_deployment.yaml + - broker_deployment.yaml tests: - it: default values diff --git a/charts/snyk-broker/tests/cra_deployment_harbor_test.yaml b/charts/snyk-broker/tests/cra_deployment_harbor_test.yaml new file mode 100644 index 0000000..32926ae --- /dev/null +++ b/charts/snyk-broker/tests/cra_deployment_harbor_test.yaml @@ -0,0 +1,11 @@ +suite: test broker deployment +templates: + - cra_deployment.yaml + - broker_deployment.yaml + +tests: + - it: default values + values: + - ./fixtures/default_values_cra_harbor.yaml + asserts: + - matchSnapshot: {} \ No newline at end of file diff --git a/charts/snyk-broker/tests/cra_deployment_test.yaml b/charts/snyk-broker/tests/cra_deployment_test.yaml index fe9cd34..b6454fe 100644 --- a/charts/snyk-broker/tests/cra_deployment_test.yaml +++ b/charts/snyk-broker/tests/cra_deployment_test.yaml @@ -1,6 +1,7 @@ suite: test broker deployment templates: - cra_deployment.yaml + - broker_deployment.yaml tests: - it: default values diff --git a/charts/snyk-broker/tests/fixtures/default_values_cra.yaml b/charts/snyk-broker/tests/fixtures/default_values_cra.yaml index cdc9d71..f597c85 100644 --- a/charts/snyk-broker/tests/fixtures/default_values_cra.yaml +++ b/charts/snyk-broker/tests/fixtures/default_values_cra.yaml @@ -23,6 +23,8 @@ brokerDispatcherUrl: "https://api.test.snyk.io" scmType: "container-registry-agent" +crType: "ecr" + crRoleArn: "arn:aws-us-gov:iam::123456789012:role" crRegion: "eu-west" diff --git a/charts/snyk-broker/tests/fixtures/default_values_cra_digital_ocean.yaml b/charts/snyk-broker/tests/fixtures/default_values_cra_digital_ocean.yaml new file mode 100644 index 0000000..603e663 --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_cra_digital_ocean.yaml @@ -0,0 +1,30 @@ +# Default values for snyk-broker with Container Registry Agent. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +##### Snyk Specific Values ##### + +# Broker Token is a value from Snyk. Get this from the integration settings page or your Snyk Representative +brokerToken: "123" + +# brokerClientUrl is the address of the broker. This needs to be the address of itself. In the case of Kubernetes, you need to ensure that you are pointing to the cluster ingress you have setup. +# Ex: http://kubernetes-ingress.domain.com:8000/broker +brokerClientUrl: "http://brokerclient" + +# Do not touch unless directed by a Snyk Representative +brokerServerUrl: "https://broker.test.snyk.io" + +preflightChecks: + enabled: true + +highAvailabilityMode: + enabled: false +brokerDispatcherUrl: "https://api.test.snyk.io" + +scmType: "container-registry-agent" + +crType: "digitalocean-cr" + +crBase: "digitaloceanbase" + +crToken: "mytoken" diff --git a/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.yaml index e887013..58367ee 100644 --- a/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.yaml +++ b/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.yaml @@ -23,6 +23,8 @@ brokerDispatcherUrl: "https://api.test.snyk.io" scmType: "container-registry-agent" +crType: "ecr" + crRoleArn: "arn:aws-us-gov:iam::123456789012:role" crRegion: "eu-west" diff --git a/charts/snyk-broker/tests/fixtures/default_values_cra_harbor.yaml b/charts/snyk-broker/tests/fixtures/default_values_cra_harbor.yaml new file mode 100644 index 0000000..7110ab4 --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_cra_harbor.yaml @@ -0,0 +1,32 @@ +# Default values for snyk-broker with Container Registry Agent. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +##### Snyk Specific Values ##### + +# Broker Token is a value from Snyk. Get this from the integration settings page or your Snyk Representative +brokerToken: "123" + +# brokerClientUrl is the address of the broker. This needs to be the address of itself. In the case of Kubernetes, you need to ensure that you are pointing to the cluster ingress you have setup. +# Ex: http://kubernetes-ingress.domain.com:8000/broker +brokerClientUrl: "http://brokerclient" + +# Do not touch unless directed by a Snyk Representative +brokerServerUrl: "https://broker.test.snyk.io" + +preflightChecks: + enabled: true + +highAvailabilityMode: + enabled: false +brokerDispatcherUrl: "https://api.test.snyk.io" + +scmType: "container-registry-agent" + +crType: "harbor" + +crBase: "crBaseValue" + +crUsername: myusername + +crPassword: mypassword \ No newline at end of file