-
Notifications
You must be signed in to change notification settings - Fork 37
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 #80 from snyk/fix/typo-in-ingress
fix: ingress name updating avoiding single ns collision
- Loading branch information
Showing
7 changed files
with
220 additions
and
23 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,5 +1,5 @@ | ||
| apiVersion: v2 | ||
| name: snyk-broker | ||
| version: 2.0.0 | ||
| version: 2.0.1 | ||
| 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
155 changes: 155 additions & 0 deletions
155
charts/snyk-broker/tests/__snapshot__/broker_deployment_ingress_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,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-RELEASE-NAME | ||
| helm.sh/chart: snyk-broker-2.0.1 | ||
| name: github-com-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: github-com-broker-token-key | ||
| name: github-com-broker-token-RELEASE-NAME | ||
| - name: GITHUB_TOKEN | ||
| valueFrom: | ||
| secretKeyRef: | ||
| key: github-com-token-key | ||
| name: github-com-token-RELEASE-NAME | ||
| - 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-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: extensions/v1beta1 | ||
| kind: Ingress | ||
| 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.1 | ||
| name: RELEASE-NAME-snyk-broker-RELEASE-NAME | ||
| namespace: NAMESPACE | ||
| spec: | ||
| rules: | ||
| - host: <ENTER_BROKER_CLIENT_URL> | ||
| http: | ||
| paths: | ||
| - backend: | ||
| serviceName: github-com-broker-service-RELEASE-NAME | ||
| 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-RELEASE-NAME | ||
| helm.sh/chart: snyk-broker-2.0.1 | ||
| name: github-com-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 | ||
| 4: | | ||
| apiVersion: v1 | ||
| data: | ||
| github-com-broker-token-key: MTIz | ||
| kind: Secret | ||
| metadata: | ||
| name: github-com-broker-token-RELEASE-NAME | ||
| 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-RELEASE-NAME | ||
| helm.sh/chart: snyk-broker-2.0.1 | ||
| 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
16 changes: 16 additions & 0 deletions
16
charts/snyk-broker/tests/broker_deployment_ingress_test.yaml
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,16 @@ | ||
| suite: test broker deployment with ingress | ||
| templates: | ||
| - broker_deployment.yaml | ||
| - broker_service.yaml | ||
| - secrets.yaml | ||
| - serviceaccount.yaml | ||
| - broker_ingress.yaml | ||
|
|
||
| tests: | ||
| - it: ingress | ||
| values: | ||
| - ./fixtures/default_values_with_ingress.yaml | ||
| asserts: | ||
| - matchSnapshot: {} | ||
|
|
||
|
|
Oops, something went wrong.