Move st2tests to a job #399
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,89 @@ | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: "{{ .Release.Name }}-job-st2-tests" | ||
|
Member
There was a problem hiding this comment. Name changed from |
||
| labels: {{- include "stackstorm-ha.labels" (list $ "st2tests") | nindent 4 }} | ||
| annotations: | ||
| "helm.sh/hook": test-success | ||
| "helm.sh/hook-delete-policy": hook-succeeded | ||
| spec: | ||
| template: | ||
| metadata: | ||
| name: "{{ .Release.Name }}-job-st2-tests" | ||
| labels: {{- include "stackstorm-ha.labels" (list $ "st2tests") | nindent 8 }} | ||
| annotations: | ||
| "helm.sh/hook": test-success | ||
| "helm.sh/hook-delete-policy": hook-succeeded | ||
|
Comment on lines
+14
to
+16
Member
There was a problem hiding this comment. I don't think the pod needs these helm annotations, just the top-level Job. Is that right? |
||
| spec: | ||
| initContainers: | ||
| {{- include "stackstorm-ha.init-containers-wait-for-auth" . | nindent 6 }} | ||
|
Member
There was a problem hiding this comment. This is a new templated init container you've added to ensure the tests wait until st2 is up and running. |
||
| # Sidecar container to copy BATS framework to the main container | ||
| - name: bats-core | ||
| image: "bats/bats:1.8.2" | ||
| imagePullPolicy: {{ $.Values.image.pullPolicy }} | ||
| {{- with .Values.securityContext }} | ||
| securityContext: {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
|
Comment on lines
+23
to
+26
|
||
| command: | ||
| - bash | ||
| - -ec | ||
| - | | ||
| cp -R /opt/bats /tools/ | ||
| volumeMounts: | ||
| - name: tools | ||
| mountPath: /tools | ||
| - name: bats-addons | ||
| image: "alpine/git:2.36.3" | ||
| imagePullPolicy: {{ $.Values.image.pullPolicy }} | ||
| {{- with .Values.securityContext }} | ||
| securityContext: {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
|
Comment on lines
+37
to
+40
|
||
| command: | ||
| - ash | ||
| - -ec | ||
| - | | ||
| git clone --config advice.detachedHead=false --depth 1 --branch v0.3.0 \ | ||
| https://github.com/ztombol/bats-assert /tools/bats-assert | ||
| git clone --config advice.detachedHead=false --depth 1 --branch v0.2.0 \ | ||
| https://github.com/ztombol/bats-file /tools/bats-file | ||
| git clone --config advice.detachedHead=false --depth 1 --branch v0.3.0 \ | ||
| https://github.com/ztombol/bats-support /tools/bats-support | ||
| volumeMounts: | ||
| - name: tools | ||
| mountPath: /tools | ||
| # Run the actual BATS tests | ||
| containers: | ||
| - name: st2tests | ||
| image: '{{ template "stackstorm-ha.imageRepository" . }}/st2actionrunner:{{ tpl (.Values.st2actionrunner.image.tag | default .Values.image.tag) $ }}' | ||
| imagePullPolicy: {{ .Values.image.pullPolicy }} | ||
| {{- with .Values.securityContext }} | ||
| securityContext: {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
|
Comment on lines
+59
to
+61
Member
There was a problem hiding this comment. This is new. ( |
||
| envFrom: | ||
| - configMapRef: | ||
| name: {{ .Release.Name }}-st2-urls | ||
| - secretRef: | ||
| name: {{ include "stackstorm-ha.secrets.st2Auth" . }} | ||
| env: | ||
| - name: BATS_HELPERS_DIR | ||
| value: /tools | ||
| - name: ST2_VERSION | ||
| value: "{{ .Values.image.tag }}" | ||
| - name: ST2_RBAC_ENABLED | ||
| value: "{{ .Values.st2.rbac.enabled }}" | ||
| volumeMounts: | ||
| - name: tools | ||
| mountPath: /tools | ||
| - name: tests | ||
| mountPath: /tests | ||
| command: | ||
| - /tools/bats/bin/bats | ||
| - /tests/st2tests.sh | ||
| volumes: | ||
| - name: tools | ||
| emptyDir: {} | ||
| - name: tests | ||
| configMap: | ||
| name: {{ .Release.Name }}-job-st2-tests | ||
| restartPolicy: Never | ||
| backoffLimit: 0 | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see these vars in our values file:
ingress.fqdningress.classphaseCanarystackstorm-k8s/values.yaml
Lines 298 to 321 in 17e5fca
I also do not use the ingress, so these would never be defined for me.
user/pass is also only available in my cluster(s) during initial bootstrap. Once I switch to ldap, I exclusively use api tokens within helm.
Do you have any ideas on how to make this more generic?