Skip to content

Fix improper job load order for enterprise edition #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2019
Merged

Fix improper job load order for enterprise edition #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2bf092
Fix improper job load order for enterprise edition
Mar 5, 2019
3e9c442
Add a changelog record for enterprise job order & RBAC issue
Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## In Development
* Replace single-node `etcd` coordination backend with 3-node etcd HA cluster, deployed as a Helm dependency (#52)
* Fixed improper job load order for enterprise edition failing due to missing RBAC roles & assignments (#53)

## v0.9.0
* Add new Helm value setting `st2.apikeys` to allow importing predefined ST2 API keys (#36)
Expand Down
162 changes: 81 additions & 81 deletions templates/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,81 @@
{{ if .Values.enterprise.enabled }}
---
apiVersion: batch/v1
kind: Job
metadata:
name: {{ .Release.Name }}-job-st2-apply-rbac-definitions
labels:
app: st2-apply-rbac-definitions
tier: backend
vendor: stackstorm
support: enterprise
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
helm.sh/hook: post-install, post-upgrade, post-rollback
helm.sh/hook-delete-policy: before-hook-creation
helm.sh/hook-weight: "5"
spec:
template:
metadata:
name: job-st2-apply-rbac-definitions
labels:
app: st2-apply-rbac-definitions
tier: backend
vendor: stackstorm
support: enterprise
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
# TODO: Investigate/propose running Helm hook only on condition when ConfigMap or Secret has changed
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
checksum/rbac: {{ include (print $.Template.BasePath "/configmaps_rbac.yaml") . | sha256sum }}
spec:
imagePullSecrets:
- name: {{ .Release.Name }}-st2-license
containers:
- name: st2-apply-rbac-definitions
image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- st2-apply-rbac-definitions
- --verbose
- --config-file=/etc/st2/st2.conf
- --config-file=/etc/st2/st2.docker.conf
- --config-file=/etc/st2/st2.user.conf
volumeMounts:
- name: st2-config-vol
mountPath: /etc/st2/st2.docker.conf
subPath: st2.docker.conf
- name: st2-config-vol
mountPath: /etc/st2/st2.user.conf
subPath: st2.user.conf
- name: st2-rbac-roles-vol
mountPath: /opt/stackstorm/rbac/roles/
- name: st2-rbac-assignments-vol
mountPath: /opt/stackstorm/rbac/assignments/
- name: st2-rbac-mappings-vol
mountPath: /opt/stackstorm/rbac/mappings/
# TODO: Find out default resource limits for this specific service (#5)
#resources:
volumes:
- name: st2-config-vol
configMap:
name: {{ .Release.Name }}-st2-config
- name: st2-rbac-roles-vol
configMap:
name: {{ .Release.Name }}-st2-rbac-roles
- name: st2-rbac-assignments-vol
configMap:
name: {{ .Release.Name }}-st2-rbac-assignments
- name: st2-rbac-mappings-vol
configMap:
name: {{ .Release.Name }}-st2-rbac-mappings
restartPolicy: OnFailure
{{ end }}

---
apiVersion: batch/v1
kind: Job
Expand All @@ -14,7 +92,7 @@ metadata:
annotations:
helm.sh/hook: post-install, post-upgrade, post-rollback
helm.sh/hook-delete-policy: before-hook-creation
helm.sh/hook-weight: "5"
helm.sh/hook-weight: "6"
spec:
template:
metadata:
Expand Down Expand Up @@ -113,7 +191,7 @@ metadata:
annotations:
helm.sh/hook: post-install, post-upgrade, post-rollback
helm.sh/hook-delete-policy: before-hook-creation
helm.sh/hook-weight: "5"
helm.sh/hook-weight: "6"
spec:
template:
metadata:
Expand Down Expand Up @@ -221,7 +299,7 @@ metadata:
annotations:
helm.sh/hook: post-install, post-upgrade, post-rollback
helm.sh/hook-delete-policy: before-hook-creation
helm.sh/hook-weight: "6"
helm.sh/hook-weight: "7"
spec:
template:
metadata:
Expand Down Expand Up @@ -317,81 +395,3 @@ spec:
emptyDir: {}
{{- end }}
restartPolicy: OnFailure

{{ if .Values.enterprise.enabled }}
---
apiVersion: batch/v1
kind: Job
metadata:
name: {{ .Release.Name }}-job-st2-apply-rbac-definitions
labels:
app: st2-apply-rbac-definitions
tier: backend
vendor: stackstorm
support: enterprise
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
helm.sh/hook: post-install, post-upgrade, post-rollback
helm.sh/hook-delete-policy: before-hook-creation
helm.sh/hook-weight: "6"
spec:
template:
metadata:
name: job-st2-apply-rbac-definitions
labels:
app: st2-apply-rbac-definitions
tier: backend
vendor: stackstorm
support: enterprise
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
# TODO: Investigate/propose running Helm hook only on condition when ConfigMap or Secret has changed
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
checksum/rbac: {{ include (print $.Template.BasePath "/configmaps_rbac.yaml") . | sha256sum }}
spec:
imagePullSecrets:
- name: {{ .Release.Name }}-st2-license
containers:
- name: st2-apply-rbac-definitions
image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- st2-apply-rbac-definitions
- --verbose
- --config-file=/etc/st2/st2.conf
- --config-file=/etc/st2/st2.docker.conf
- --config-file=/etc/st2/st2.user.conf
volumeMounts:
- name: st2-config-vol
mountPath: /etc/st2/st2.docker.conf
subPath: st2.docker.conf
- name: st2-config-vol
mountPath: /etc/st2/st2.user.conf
subPath: st2.user.conf
- name: st2-rbac-roles-vol
mountPath: /opt/stackstorm/rbac/roles/
- name: st2-rbac-assignments-vol
mountPath: /opt/stackstorm/rbac/assignments/
- name: st2-rbac-mappings-vol
mountPath: /opt/stackstorm/rbac/mappings/
# TODO: Find out default resource limits for this specific service (#5)
#resources:
volumes:
- name: st2-config-vol
configMap:
name: {{ .Release.Name }}-st2-config
- name: st2-rbac-roles-vol
configMap:
name: {{ .Release.Name }}-st2-rbac-roles
- name: st2-rbac-assignments-vol
configMap:
name: {{ .Release.Name }}-st2-rbac-assignments
- name: st2-rbac-mappings-vol
configMap:
name: {{ .Release.Name }}-st2-rbac-mappings
restartPolicy: OnFailure
{{ end }}