diff --git a/charts/snyk-broker/Chart.yaml b/charts/snyk-broker/Chart.yaml index 7a75138..96dd52e 100644 --- a/charts/snyk-broker/Chart.yaml +++ b/charts/snyk-broker/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 name: snyk-broker -version: 2.0.3 +version: 2.1.0 description: A Helm chart for Kubernetes type: application diff --git a/charts/snyk-broker/templates/_helpers.tpl b/charts/snyk-broker/templates/_helpers.tpl index 593d8ed..45847a9 100644 --- a/charts/snyk-broker/templates/_helpers.tpl +++ b/charts/snyk-broker/templates/_helpers.tpl @@ -46,7 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} Selector labels */}} {{- define "snyk-broker.selectorLabels" -}} -app.kubernetes.io/name: {{ include "snyk-broker.name" . }}-{{ .Release.Name }} +app.kubernetes.io/name: {{ include "snyk-broker.name" . }}{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} diff --git a/charts/snyk-broker/templates/accept_configmap.yaml b/charts/snyk-broker/templates/accept_configmap.yaml index 1e13069..c6294b6 100644 --- a/charts/snyk-broker/templates/accept_configmap.yaml +++ b/charts/snyk-broker/templates/accept_configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "snyk-broker.fullname" . }}-accept-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-accept-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} diff --git a/charts/snyk-broker/templates/broker_deployment.yaml b/charts/snyk-broker/templates/broker_deployment.yaml index 35410df..d1378b0 100644 --- a/charts/snyk-broker/templates/broker_deployment.yaml +++ b/charts/snyk-broker/templates/broker_deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ .Values.scmType}}-broker-{{ .Release.Name }}" + name: "{{ .Values.scmType}}-broker{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} @@ -30,11 +30,11 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "snyk-broker.serviceAccountName" . }}-{{ .Release.Name }} + serviceAccountName: {{ include "snyk-broker.serviceAccountName" . }}{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: "{{ .Values.scmType}}-broker-{{ .Release.Name }}" + - name: "{{ .Values.scmType}}-broker{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" resources: limits: cpu: {{ .Values.brokerResources.limits.cpu }} @@ -106,12 +106,12 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: GITHUB_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: PORT value: {{ .Values.deployment.container.containerPort | squote }} @@ -123,12 +123,12 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: GITHUB_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: GITHUB value: {{ .Values.github }} @@ -147,14 +147,14 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: BITBUCKET_USERNAME value: {{ .Values.bitbucketUsername }} - name: BITBUCKET_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: BITBUCKET value: {{ .Values.bitbucket }} @@ -170,12 +170,12 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: GITLAB_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: GITLAB value: {{ .Values.gitlab }} @@ -189,12 +189,12 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: AZURE_REPOS_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: AZURE_REPOS_ORG value: {{ .Values.azureReposOrg }} @@ -210,7 +210,7 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: ARTIFACTORY_URL value: {{ .Values.artifactoryUrl }} @@ -222,17 +222,17 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType }}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType }}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: BASE_NEXUS_URL valueFrom: secretKeyRef: - name: {{ .Values.scmType }}-base-nexus-url-{{ .Release.Name }} + name: {{ .Values.scmType }}-base-nexus-url{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-base-nexus-url" - name: NEXUS_URL valueFrom: secretKeyRef: - name: {{ .Values.scmType }}-nexus-url-{{ .Release.Name }} + name: {{ .Values.scmType }}-nexus-url{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-nexus-url" - name: BROKER_CLIENT_VALIDATION_URL @@ -246,14 +246,14 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: JIRA_USERNAME value: {{ .Values.jiraUsername }} - name: JIRA_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: JIRA_HOSTNAME value: {{ .Values.jiraHostname }} @@ -267,10 +267,10 @@ spec: - name: BROKER_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-broker-token-key" - name: CR_AGENT_URL - value: http://cra-service-{{ .Release.Name }}:{{ .Values.deployment.container.crSnykPort | toString }} + value: http://cra-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}:{{ .Values.deployment.container.crSnykPort | toString }} - name: CR_TYPE value: {{ .Values.crType }} - name: CR_BASE @@ -280,12 +280,12 @@ spec: - name: CR_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: CR_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} key: "{{ .Values.scmType}}-token-key" - name: CR_ROLE_ARN value: {{ .Values.crRoleArn }} @@ -298,7 +298,7 @@ spec: - name: BROKER_CLIENT_URL value: {{ .Values.brokerClientUrl }} - name: BROKER_CLIENT_VALIDATION_URL - value: http://cra-service-{{ .Release.Name }}:{{ .Values.deployment.container.crSnykPort | toString }}/healthcheck + value: http://cra-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}:{{ .Values.deployment.container.crSnykPort | toString }}/healthcheck {{- end }} {{- if .Values.enableCodeAgent }} # Code Agent @@ -387,22 +387,22 @@ spec: {{- if (include "snyk-broker.acceptJson" .)}} - name: {{ include "snyk-broker.fullname" . }}-accept-volume configMap: - name: {{ include "snyk-broker.fullname" . }}-accept-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-accept-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} {{- end }} {{- if .Values.caCert }} - name: {{ include "snyk-broker.fullname" . }}-cacert-volume configMap: - name: {{ include "snyk-broker.fullname" . }}-cacert-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-cacert-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} {{- end }} {{- if .Values.httpsCert }} - name: {{ include "snyk-broker.fullname" . }}-httpscert-volume configMap: - name: {{ include "snyk-broker.fullname" . }}-httpscert-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-httpscert-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} {{- end }} {{- if .Values.httpsKey }} - name: {{ include "snyk-broker.fullname" . }}-httpskey-volume configMap: - name: {{ include "snyk-broker.fullname" . }}-httpskey-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-httpskey-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} {{- end }} {{- if .Values.extraVolumes }} {{ tpl (toYaml .Values.extraVolumes | indent 6) . }} diff --git a/charts/snyk-broker/templates/broker_ingress.yaml b/charts/snyk-broker/templates/broker_ingress.yaml index 35fdbc7..e69425e 100644 --- a/charts/snyk-broker/templates/broker_ingress.yaml +++ b/charts/snyk-broker/templates/broker_ingress.yaml @@ -9,10 +9,11 @@ {{- $ingressPathType := .Values.brokerIngress.pathType -}} {{- $extraPaths := .Values.brokerIngress.extraPaths -}} {{- $releaseName := .Release.Name -}} +{{- $disableSuffixes := .Values.disableSuffixes }} apiVersion: {{ include "snyk-broker.ingress.apiVersion" . }} kind: Ingress metadata: - name: {{ $fullName }}-{{ .Release.Name }} + name: {{ $fullName }}{{ if not $disableSuffixes}}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} @@ -49,11 +50,11 @@ spec: backend: {{- if $ingressApiIsStable }} service: - name: {{ $scmType }}-broker-service-{{ $releaseName }} + name: {{ $scmType }}-broker-service{{ if not $disableSuffixes}}-{{ $releaseName }}{{ end }} port: number: {{ $servicePort }} {{- else }} - serviceName: {{ $scmType }}-broker-service-{{ $releaseName }} + serviceName: {{ $scmType }}-broker-service{{ if not $disableSuffixes}}-{{ $releaseName }}{{ end }} servicePort: {{ $servicePort }} {{- end }} {{- end }} @@ -63,11 +64,11 @@ spec: - backend: {{- if $ingressApiIsStable }} service: - name: {{ $scmType }}-broker-service-{{ .Release.Name }} + name: {{ $scmType }}-broker-service{{ if not $disableSuffixes}}-{{ $releaseName }}{{ end }} port: number: {{ $servicePort }} {{- else }} - serviceName: {{ $scmType }}-broker-service-{{ .Release.Name }} + serviceName: {{ $scmType }}-broker-service{{ if not $disableSuffixes}}-{{ $releaseName }}{{ end }} servicePort: {{ $servicePort }} {{- end }} {{- if $ingressPath }} diff --git a/charts/snyk-broker/templates/broker_service.yaml b/charts/snyk-broker/templates/broker_service.yaml index 4fd2407..b48f6f8 100644 --- a/charts/snyk-broker/templates/broker_service.yaml +++ b/charts/snyk-broker/templates/broker_service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: "{{ .Values.scmType}}-broker-service-{{ .Release.Name }}" + name: "{{ .Values.scmType}}-broker-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} diff --git a/charts/snyk-broker/templates/cacert_configmap.yaml b/charts/snyk-broker/templates/cacert_configmap.yaml index b52742c..bbd7ecf 100644 --- a/charts/snyk-broker/templates/cacert_configmap.yaml +++ b/charts/snyk-broker/templates/cacert_configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "snyk-broker.fullname" . }}-cacert-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-cacert-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} @@ -14,7 +14,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "snyk-broker.fullname" . }}-cacert-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-cacert-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} diff --git a/charts/snyk-broker/templates/code_agent_deployment.yaml b/charts/snyk-broker/templates/code_agent_deployment.yaml index 3d01fbb..0a71825 100644 --- a/charts/snyk-broker/templates/code_agent_deployment.yaml +++ b/charts/snyk-broker/templates/code_agent_deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ .Values.scmType}}-code-agent-{{ .Release.Name }}" + name: "{{ .Values.scmType}}-code-agent{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" namespace: {{ .Release.Namespace }} labels: app.kubernetes.io/name: {{ .Release.Name }}-ca @@ -29,7 +29,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "snyk-broker.serviceAccountName" . }}-{{ .Release.Name }} + serviceAccountName: {{ include "snyk-broker.serviceAccountName" . }}{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -80,7 +80,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: "code-agent-service-{{ .Release.Name }}" + name: "code-agent-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} diff --git a/charts/snyk-broker/templates/cra_deployment.yaml b/charts/snyk-broker/templates/cra_deployment.yaml index 2b888dc..a7fbc96 100644 --- a/charts/snyk-broker/templates/cra_deployment.yaml +++ b/charts/snyk-broker/templates/cra_deployment.yaml @@ -2,10 +2,10 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ .Values.scmType}}-cra-{{ .Release.Name }}" + name: "{{ .Values.scmType}}-cra{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }}-cr-{{ .Release.Name }} + app.kubernetes.io/name: {{ .Release.Name }}-cr{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} app.kubernetes.io/instance: {{ .Release.Name }} spec: {{- if not .Values.autoscaling.enabled }} @@ -13,7 +13,7 @@ spec: {{- end }} selector: matchLabels: - app.kubernetes.io/name: {{ .Release.Name }}-cr-{{ .Release.Name }} + app.kubernetes.io/name: {{ .Release.Name }}-cr{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: @@ -22,18 +22,18 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - app.kubernetes.io/name: {{ .Release.Name }}-cr-{{ .Release.Name }} + app.kubernetes.io/name: {{ .Release.Name }}-cr{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} app.kubernetes.io/instance: {{ .Release.Name }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "snyk-broker.serviceAccountName" . }}-{{ .Release.Name }} + serviceAccountName: {{ include "snyk-broker.serviceAccountName" . }}{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: container-registry-agent-{{ .Release.Name }} + - name: container-registry-agent{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} resources: limits: cpu: {{ .Values.crResources.limits.cpu }} @@ -67,7 +67,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: "cra-service-{{ .Release.Name }}" + name: "cra-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}" namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} @@ -77,6 +77,6 @@ spec: - port: {{ .Values.deployment.container.crSnykPort }} targetPort: {{ .Values.deployment.container.crSnykPort}} selector: - app.kubernetes.io/name: {{ .Release.Name }}-cr-{{ .Release.Name }} + app.kubernetes.io/name: {{ .Release.Name }}-cr{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} diff --git a/charts/snyk-broker/templates/httpscert_configmap.yaml b/charts/snyk-broker/templates/httpscert_configmap.yaml index 4c7f1cf..b4bf9d1 100644 --- a/charts/snyk-broker/templates/httpscert_configmap.yaml +++ b/charts/snyk-broker/templates/httpscert_configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "snyk-broker.fullname" . }}-httpscert-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-httpscert-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} diff --git a/charts/snyk-broker/templates/httpskey_configmap.yaml b/charts/snyk-broker/templates/httpskey_configmap.yaml index 4eb9650..565dbdf 100644 --- a/charts/snyk-broker/templates/httpskey_configmap.yaml +++ b/charts/snyk-broker/templates/httpskey_configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "snyk-broker.fullname" . }}-httpskey-configmap-{{ .Release.Name }} + name: {{ include "snyk-broker.fullname" . }}-httpskey-configmap{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} diff --git a/charts/snyk-broker/templates/secrets.yaml b/charts/snyk-broker/templates/secrets.yaml index 273d55b..167a75a 100644 --- a/charts/snyk-broker/templates/secrets.yaml +++ b/charts/snyk-broker/templates/secrets.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-broker-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-broker-token-key": {{ .Values.brokerToken | b64enc | quote }} @@ -12,7 +12,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-token-key": {{ .Values.scmToken | b64enc | quote }} @@ -22,7 +22,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-token-key": {{ .Values.bitbucketPassword | b64enc | quote }} @@ -32,7 +32,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-token-key": {{ .Values.azureReposToken | b64enc | quote }} @@ -42,7 +42,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-token-key": {{ .Values.jiraPassword | b64enc | quote }} @@ -52,7 +52,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-token-key": {{ .Values.crPassword | b64enc | quote }} @@ -62,7 +62,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ .Values.scmType}}-token-{{ .Release.Name }} + name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "{{ .Values.scmType}}-token-key": {{ .Values.crToken | b64enc | quote }} @@ -72,7 +72,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: snyk-token-{{ .Release.Name }} + name: snyk-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "snyk-token-key": {{ .Values.snykToken | b64enc | quote }} @@ -82,7 +82,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: nexus-base-nexus-url-{{ .Release.Name }} + name: nexus-base-nexus-url{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "nexus-base-nexus-url": {{ .Values.baseNexusUrl | b64enc | quote }} @@ -92,7 +92,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: nexus-nexus-url-{{ .Release.Name }} + name: nexus-nexus-url{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} type: Opaque data: "nexus-nexus-url": {{ .Values.nexusUrl | b64enc | quote }} diff --git a/charts/snyk-broker/templates/serviceaccount.yaml b/charts/snyk-broker/templates/serviceaccount.yaml index 0639f9e..c7a6216 100644 --- a/charts/snyk-broker/templates/serviceaccount.yaml +++ b/charts/snyk-broker/templates/serviceaccount.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "snyk-broker.serviceAccountName" . }}-{{ .Release.Name }} + name: {{ include "snyk-broker.serviceAccountName" . }}{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }} namespace: {{ .Release.Namespace }} labels: {{- include "snyk-broker.labels" . | nindent 4 }} 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 new file mode 100644 index 0000000..7177063 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_disablesuffixes_test.yaml.snap @@ -0,0 +1,152 @@ +with CRA: + 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.1.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: 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 + - 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://brokerclient + - 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: 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.1.0 + name: container-registry-agent-broker-service-RELEASE-NAME + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker-RELEASE-NAME + type: ClusterIP + 3: | + apiVersion: v1 + data: + container-registry-agent-broker-token-key: MTIz + kind: Secret + metadata: + name: container-registry-agent-broker-token-RELEASE-NAME + type: Opaque + 4: | + apiVersion: v1 + kind: ServiceAccount + 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.1.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 91cda2d..7177063 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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: container-registry-agent-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -120,7 +120,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: container-registry-agent-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -147,6 +147,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.0.3 + helm.sh/chart: snyk-broker-2.1.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 new file mode 100644 index 0000000..8c5f7a5 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_disablesuffixes_test.yaml.snap @@ -0,0 +1,325 @@ +cacert: + 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.1.0 + name: github-com-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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: CA_CERT + value: /home/node/cacert/tests/dummy_ca_cert.pem + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: + - mountPath: /home/node/cacert + name: RELEASE-NAME-snyk-broker-cacert-volume + readOnly: true + securityContext: {} + serviceAccountName: snyk-broker + volumes: + - configMap: + name: RELEASE-NAME-snyk-broker-cacert-configmap + name: RELEASE-NAME-snyk-broker-cacert-volume + 2: | + apiVersion: v1 + kind: Service + 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.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 3: | + apiVersion: v1 + data: + dummy_ca_cert.pem: |- + -----BEGIN CERTIFICATE----- + MIIDYzCCAksCFAYMPiMLU27bbnNw60gZkdMg4Rr2MA0GCSqGSIb3DQEBCwUAMG4x + CzAJBgNVBAYTAkNIMQswCQYDVQQIDAJBQTELMAkGA1UEBwwCQUExCzAJBgNVBAoM + AkFBMQswCQYDVQQLDAJBQTELMAkGA1UEAwwCQUExHjAcBgkqhkiG9w0BCQEWD2Fu + dG9pbmVAc255ay5pbzAeFw0yMzA4MzEyMTE2NDRaFw0yNDA4MzAyMTE2NDRaMG4x + CzAJBgNVBAYTAkNIMQswCQYDVQQIDAJBQTELMAkGA1UEBwwCQUExCzAJBgNVBAoM + AkFBMQswCQYDVQQLDAJBQTELMAkGA1UEAwwCQUExHjAcBgkqhkiG9w0BCQEWD2Fu + dG9pbmVAc255ay5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPSe + fzWIMgAFuIwP4ScnLoZPb75dKLy8Ao2QtowF6WyntFuNWPJPLbs8sTeRPPbtbDYn + k2rfi15vQWL7HB7uKqTwFdXmf4kZu9SNxH1c7q+KNtYm1hiMBOlhM951N3gcefCE + W8A2rD95ngZlDdnFfBmsWvomg2a8OQjveMA9Nl3aR8qFNsym52yphTAilV+QMmmj + Xc7V/ElQElXN9uoSIbg6eTZ/yNqPDkdEQ+0f033IheHTdjFgnmCY4kFBp/4X6dDj + vUbmfvQ8c3GN11SvyoJgrd0grquiIp3qHRXIfr+U6Z5aAT+G4/paTnuRlMFhpQwV + D0Ur9jto7i/xo0gDArMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAP7c+rHqEbST8 + Vd25DNmhwb4hEGI2K8+YWixauZJOcRwamLrQree7UHn0EeWW+qZa2ec5G2y2fGb9 + HrB6C3LvDb0rmXWXbWTSM3Mj55ITDIYD3xBe2I5+jlykrxlEsC5QwFXMMbDKFwQj + J7V6gFfjJweX8Ko9kUdXdKmx2/napkPEkU8hoAZ4cMaaqfx6d2hvQL+2flQkjH+A + B3AgJ/FdaW0sb5caSstO1BEg3NgpJjO1YKRkxb1hkrjNRSJ2NfTkCwiTp9yIz25u + 2UANxr7bbnEPd4bkk7OjE6SL+RH3YMCa3sBqtKwY14vs61AoWlS1bE0z8aRRsX49 + owemeenoGQ== + -----END CERTIFICATE----- + kind: ConfigMap + 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.1.0 + name: RELEASE-NAME-snyk-broker-cacert-configmap + namespace: NAMESPACE + 4: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 5: | + apiVersion: v1 + kind: ServiceAccount + 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.1.0 + name: snyk-broker + namespace: NAMESPACE +cacertfile: + 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.1.0 + name: github-com-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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: v1 + kind: Service + 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.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 3: | + apiVersion: v1 + data: + cacert: testValueSetBySetFile + kind: ConfigMap + 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.1.0 + name: RELEASE-NAME-snyk-broker-cacert-configmap + namespace: NAMESPACE + 4: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 5: | + apiVersion: v1 + kind: ServiceAccount + 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.1.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 50901fe..57c6bc3 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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -111,7 +111,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -153,7 +153,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: RELEASE-NAME-snyk-broker-cacert-configmap-RELEASE-NAME namespace: NAMESPACE 4: | @@ -172,7 +172,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE cacertfile: @@ -184,7 +184,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: github-com-broker-RELEASE-NAME namespace: NAMESPACE spec: @@ -280,7 +280,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: github-com-broker-service-RELEASE-NAME namespace: NAMESPACE spec: @@ -301,7 +301,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: RELEASE-NAME-snyk-broker-cacert-configmap-RELEASE-NAME namespace: NAMESPACE 4: | @@ -320,6 +320,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.0.3 + helm.sh/chart: snyk-broker-2.1.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 new file mode 100644 index 0000000..4692354 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_customaccept_disablesuffixes_test.yaml.snap @@ -0,0 +1,152 @@ +customaccept values: + 1: | + apiVersion: v1 + data: + accept.json: test + kind: ConfigMap + 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.1.0 + name: RELEASE-NAME-snyk-broker-accept-configmap + namespace: NAMESPACE + 2: | + 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.1.0 + name: github-com-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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT + value: /home/node/private/accept.json + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: + - mountPath: /home/node/private + name: RELEASE-NAME-snyk-broker-accept-volume + readOnly: true + securityContext: {} + serviceAccountName: snyk-broker + volumes: + - configMap: + name: RELEASE-NAME-snyk-broker-accept-configmap + name: RELEASE-NAME-snyk-broker-accept-volume + 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 + helm.sh/chart: snyk-broker-2.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 4: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 5: | + apiVersion: v1 + kind: ServiceAccount + 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.1.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 ff6a303..6575be9 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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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 new file mode 100644 index 0000000..7ee0a93 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_disablesuffixes_test.yaml.snap @@ -0,0 +1,546 @@ +HA mode on: + 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.1.0 + name: github-com-broker + namespace: NAMESPACE + spec: + replicas: 2 + 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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: BROKER_HA_MODE_ENABLED + value: "true" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: v1 + kind: Service + 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.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 3: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 4: | + apiVersion: v1 + kind: ServiceAccount + 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.1.0 + name: snyk-broker + namespace: NAMESPACE +HA mode on with 4 replicas: + 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.1.0 + name: github-com-broker + namespace: NAMESPACE + spec: + replicas: 4 + 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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: BROKER_HA_MODE_ENABLED + value: "true" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: v1 + kind: Service + 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.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 3: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 4: | + apiVersion: v1 + kind: ServiceAccount + 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.1.0 + name: snyk-broker + namespace: NAMESPACE +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.1.0 + name: github-com-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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: v1 + kind: Service + 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.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 3: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 4: | + apiVersion: v1 + kind: ServiceAccount + 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.1.0 + name: snyk-broker + namespace: NAMESPACE +preflight checks off: + 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.1.0 + name: github-com-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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: PREFLIGHT_CHECKS_ENABLED + value: "false" + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: v1 + kind: Service + 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.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 3: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 4: | + apiVersion: v1 + kind: ServiceAccount + 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.1.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 new file mode 100644 index 0000000..e0aceb9 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_disablesuffixes_test.yaml.snap @@ -0,0 +1,155 @@ +ingress: + 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.1.0 + name: github-com-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: github-com-broker-token-key + name: github-com-broker-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + key: github-com-token-key + name: github-com-token + - name: PORT + value: "8000" + - name: BROKER_CLIENT_URL + value: http://brokerclient + - name: LOG_LEVEL + value: info + - name: LOG_ENABLE_BODY + value: "false" + - name: ACCEPT_CODE + value: "true" + - name: ACCEPT_IAC + value: tf,yaml,yml,json,tpl + - name: BROKER_DISPATCHER_BASE_URL + value: https://api.test.snyk.io + image: snyk/broker:github-com + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /healthcheck + port: 8000 + initialDelaySeconds: 3 + periodSeconds: 10 + timeoutSeconds: 1 + name: github-com-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: extensions/v1beta1 + kind: Ingress + 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.1.0 + name: RELEASE-NAME-snyk-broker + namespace: NAMESPACE + spec: + rules: + - host: + http: + paths: + - backend: + serviceName: github-com-broker-service + servicePort: 8000 + path: / + 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 + helm.sh/chart: snyk-broker-2.1.0 + name: github-com-broker-service + namespace: NAMESPACE + spec: + ports: + - port: 8000 + targetPort: 8000 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: snyk-broker + type: ClusterIP + 4: | + apiVersion: v1 + data: + github-com-broker-token-key: MTIz + kind: Secret + metadata: + name: github-com-broker-token + type: Opaque + 5: | + apiVersion: v1 + kind: ServiceAccount + 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.1.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 a255530..a6d605e 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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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 085b34e..1530e62 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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: snyk-broker-RELEASE-NAME namespace: NAMESPACE 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 new file mode 100644 index 0000000..ee471d9 --- /dev/null +++ b/charts/snyk-broker/tests/__snapshot__/cra_deployment_disablesuffixes_test.yaml.snap @@ -0,0 +1,68 @@ +default values: + 1: | + apiVersion: apps/v1 + kind: Deployment + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr + name: container-registry-agent-cra + namespace: NAMESPACE + spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr + template: + metadata: + labels: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr + spec: + containers: + - env: + - name: SNYK_PORT + value: "8081" + image: snyk/container-registry-agent:latest + imagePullPolicy: Always + name: container-registry-agent + 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 + 2: | + apiVersion: v1 + kind: Service + 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.1.0 + name: cra-service + namespace: NAMESPACE + spec: + ports: + - port: 8081 + targetPort: 8081 + selector: + app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/name: RELEASE-NAME-cr + 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 3e28938..d40a1b2 100644 --- a/charts/snyk-broker/tests/__snapshot__/cra_deployment_test.yaml.snap +++ b/charts/snyk-broker/tests/__snapshot__/cra_deployment_test.yaml.snap @@ -55,7 +55,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.0.3 + helm.sh/chart: snyk-broker-2.1.0 name: cra-service-RELEASE-NAME namespace: NAMESPACE spec: diff --git a/charts/snyk-broker/tests/broker_cra_deployment_disablesuffixes_test.yaml b/charts/snyk-broker/tests/broker_cra_deployment_disablesuffixes_test.yaml new file mode 100644 index 0000000..9db6da2 --- /dev/null +++ b/charts/snyk-broker/tests/broker_cra_deployment_disablesuffixes_test.yaml @@ -0,0 +1,13 @@ +suite: test broker deployment (No suffixes) +templates: + - broker_deployment.yaml + - broker_service.yaml + - secrets.yaml + - serviceaccount.yaml + +tests: + - it: with CRA + values: + - ./fixtures/default_values_cra.yaml + asserts: + - matchSnapshot: {} \ No newline at end of file diff --git a/charts/snyk-broker/tests/broker_deployment_configmap_disablesuffixes_test.yaml b/charts/snyk-broker/tests/broker_deployment_configmap_disablesuffixes_test.yaml new file mode 100644 index 0000000..5bad5ff --- /dev/null +++ b/charts/snyk-broker/tests/broker_deployment_configmap_disablesuffixes_test.yaml @@ -0,0 +1,25 @@ +suite: test broker deployment (No suffixes) +templates: + - broker_deployment.yaml + - broker_service.yaml + - secrets.yaml + - serviceaccount.yaml + - cacert_configmap.yaml + +tests: + - it: cacert + values: + - ./fixtures/default_values_disablesuffixes.yaml + set: + caCert: tests/dummy_ca_cert.pem + asserts: + - matchSnapshot: {} + - it: cacertfile + values: + - ./fixtures/default_values_disablesuffixes.yaml + set: + caCertFile: testValueSetBySetFile + asserts: + - matchSnapshot: {} + + diff --git a/charts/snyk-broker/tests/broker_deployment_customaccept_disablesuffixes_test.yaml b/charts/snyk-broker/tests/broker_deployment_customaccept_disablesuffixes_test.yaml new file mode 100644 index 0000000..e5e3405 --- /dev/null +++ b/charts/snyk-broker/tests/broker_deployment_customaccept_disablesuffixes_test.yaml @@ -0,0 +1,15 @@ +suite: test broker deployment (No suffixes) +templates: + - broker_deployment.yaml + - broker_service.yaml + - secrets.yaml + - serviceaccount.yaml + - accept_configmap.yaml + +tests: + - it: customaccept values + values: + - ./fixtures/customaccept_values_disablesuffixes.yaml + asserts: + - matchSnapshot: {} + diff --git a/charts/snyk-broker/tests/broker_deployment_disablesuffixes_test.yaml b/charts/snyk-broker/tests/broker_deployment_disablesuffixes_test.yaml new file mode 100644 index 0000000..0bd80b1 --- /dev/null +++ b/charts/snyk-broker/tests/broker_deployment_disablesuffixes_test.yaml @@ -0,0 +1,28 @@ +suite: test broker deployment (No suffixes) +templates: + - broker_deployment.yaml + - broker_service.yaml + - secrets.yaml + - serviceaccount.yaml + +tests: + - it: default values + values: + - ./fixtures/default_values_disablesuffixes.yaml + asserts: + - matchSnapshot: {} + - it: preflight checks off + values: + - ./fixtures/default_values_preflight_off_disablesuffixes.yaml + asserts: + - matchSnapshot: {} + - it: HA mode on + values: + - ./fixtures/default_values_ha_on_disablesuffixes.yaml + asserts: + - matchSnapshot: {} + - it: HA mode on with 4 replicas + values: + - ./fixtures/default_values_ha_on_4_replicas_disablesuffixes.yaml + asserts: + - matchSnapshot: {} diff --git a/charts/snyk-broker/tests/broker_deployment_ingress_disablesuffixes_test.yaml b/charts/snyk-broker/tests/broker_deployment_ingress_disablesuffixes_test.yaml new file mode 100644 index 0000000..d4e11be --- /dev/null +++ b/charts/snyk-broker/tests/broker_deployment_ingress_disablesuffixes_test.yaml @@ -0,0 +1,16 @@ +suite: test broker deployment with ingress (No suffixes) +templates: + - broker_deployment.yaml + - broker_service.yaml + - secrets.yaml + - serviceaccount.yaml + - broker_ingress.yaml + +tests: + - it: ingress + values: + - ./fixtures/default_values_with_ingress_disablesuffixes.yaml + asserts: + - matchSnapshot: {} + + diff --git a/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml b/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml new file mode 100644 index 0000000..31ed2c3 --- /dev/null +++ b/charts/snyk-broker/tests/cra_deployment_disablesuffixes_test.yaml @@ -0,0 +1,10 @@ +suite: test broker deployment (No suffixes) +templates: + - cra_deployment.yaml + +tests: + - it: default values + values: + - ./fixtures/default_values_cra_disablesuffixes.yaml + asserts: + - matchSnapshot: {} \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/customaccept_values_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/customaccept_values_disablesuffixes.yaml new file mode 100644 index 0000000..e4cb7fc --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/customaccept_values_disablesuffixes.yaml @@ -0,0 +1,27 @@ +# Default values for snyk-broker. +# 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" + +acceptJson: | + test + +disableSuffixes: true \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.yaml new file mode 100644 index 0000000..e887013 --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_cra_disablesuffixes.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" + +crRoleArn: "arn:aws-us-gov:iam::123456789012:role" + +crRegion: "eu-west" + +crExternalId: "11111111-1111-1111-1111-111111111111" + +disableSuffixes: true \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/default_values_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_disablesuffixes.yaml new file mode 100644 index 0000000..b3ccade --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_disablesuffixes.yaml @@ -0,0 +1,24 @@ +# Default values for snyk-broker. +# 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" + +disableSuffixes: true \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/default_values_ha_on_4_replicas_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_ha_on_4_replicas_disablesuffixes.yaml new file mode 100644 index 0000000..c534d5e --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_ha_on_4_replicas_disablesuffixes.yaml @@ -0,0 +1,26 @@ +# Default values for snyk-broker. +# 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: true +brokerDispatcherUrl: "https://api.test.snyk.io" + +replicaCount: 4 + +disableSuffixes: true \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/default_values_ha_on_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_ha_on_disablesuffixes.yaml new file mode 100644 index 0000000..4766fa2 --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_ha_on_disablesuffixes.yaml @@ -0,0 +1,24 @@ +# Default values for snyk-broker. +# 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: true +brokerDispatcherUrl: "https://api.test.snyk.io" + +disableSuffixes: true \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/default_values_preflight_off_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_preflight_off_disablesuffixes.yaml new file mode 100644 index 0000000..f4648b2 --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_preflight_off_disablesuffixes.yaml @@ -0,0 +1,24 @@ +# Default values for snyk-broker. +# 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: false + +highAvailabilityMode: + enabled: false +brokerDispatcherUrl: "https://api.test.snyk.io" + +disableSuffixes: true \ No newline at end of file diff --git a/charts/snyk-broker/tests/fixtures/default_values_with_ingress_disablesuffixes.yaml b/charts/snyk-broker/tests/fixtures/default_values_with_ingress_disablesuffixes.yaml new file mode 100644 index 0000000..175c9c7 --- /dev/null +++ b/charts/snyk-broker/tests/fixtures/default_values_with_ingress_disablesuffixes.yaml @@ -0,0 +1,27 @@ +# Default values for snyk-broker. +# 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" + +brokerIngress: + enabled: true + +disableSuffixes: true \ No newline at end of file