-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #82 from snyk/fix/cra-deployments
fix: DRA helm chart installs failing
- Loading branch information
Showing
12 changed files
with
306 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,6 @@ | ||
| * @snyk/team-broker | ||
|
|
||
| charts/snyk-broker/templates/cra_deployment.yaml @snyk/container-integration | ||
| charts/snyk-broker/tests/broker_cra_deployment_test.yaml @snyk/container-integration | ||
| charts/snyk-broker/tests/cra_deployment_test.yaml @snyk/container-integration | ||
| charts/snyk-broker/tests/fixtures/default_values_cra.yaml @snyk/container-integration |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| apiVersion: v2 | ||
| name: snyk-broker | ||
| version: 2.0.1 | ||
| version: 2.0.2 | ||
| description: A Helm chart for Kubernetes | ||
| type: application |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
charts/snyk-broker/tests/__snapshot__/broker_cra_deployment_test.yaml.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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.0.2 | ||
| 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.0.2 | ||
| 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.0.2 | ||
| name: snyk-broker-RELEASE-NAME | ||
| namespace: NAMESPACE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.