Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions charts/api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

This chart does not yet follow SemVer.

## 0.36.1
- Restrict the API queue ServiceAccount to the namespaces it uses

## 0.36.0
- Populates env var `ELASTICSEARCH_HOST`
- Removes env vars
Expand Down
2 changes: 1 addition & 1 deletion charts/api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for the WBStack API
name: api
version: 0.36.0
version: 0.36.1
home: https://github.com/wbstack
maintainers:
- name: WBstack
Expand Down
2 changes: 2 additions & 0 deletions charts/api/templates/deployment-queue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ spec:
key: oauth-private.key
- name: API_JOB_NAMESPACE
value: {{ $.Values.queue.apiJobNamespace }}
- name: WBSTACK_QS_JOB_NAMESPACE
value: {{ $.Values.queue.qsJobNamespace }}
{{- if $.Values.app.gce.serviceAccountSecret }}
volumeMounts:
- name: "service-account-wbstack-api"
Expand Down
5 changes: 1 addition & 4 deletions charts/api/templates/role-defaultrole.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
kind: Role
metadata:
name: {{ include "api.fullname" . }}-defaultrole
labels:
Expand All @@ -11,9 +11,6 @@ rules:
- apiGroups: [""]
resources: ["pods", "services"]
verbs: ["get", "list", "watch"]
- apiGroups: ["batch"]
resources: ["jobs"]
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
- apiGroups: [""]
resources: ["configmaps"]
verbs: ["get", "list", "update", "patch"]
23 changes: 23 additions & 0 deletions charts/api/templates/role-jobmanager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "api.fullname" . }}-api-jobmanager
namespace: {{ .Values.queue.apiJobNamespace }}
labels:
{{ include "api.labels" . | indent 4 }}
rules:
- apiGroups: ["batch"]
resources: ["jobs"]
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "api.fullname" . }}-qs-jobmanager
namespace: {{ .Values.queue.qsJobNamespace }}
labels:
{{ include "api.labels" . | indent 4 }}
rules:
- apiGroups: ["batch"]
resources: ["jobs"]
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
6 changes: 3 additions & 3 deletions charts/api/templates/rolebinding-defaultrole.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
kind: RoleBinding
metadata:
name: {{ include "api.fullname" . }}-defaultrole
labels:
{{ include "api.labels" . | indent 4 }}
subjects:
- kind: ServiceAccount
name: {{ include "api.fullname" . }}-defaultrole
namespace: default
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
kind: Role
name: {{ include "api.fullname" . }}-defaultrole
apiGroup: rbac.authorization.k8s.io
31 changes: 31 additions & 0 deletions charts/api/templates/rolebinding-jobmanager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "api.fullname" . }}-api-jobmanager
namespace: {{ .Values.queue.apiJobNamespace }}
labels:
{{ include "api.labels" . | indent 4 }}
subjects:
- kind: ServiceAccount
name: {{ include "api.fullname" . }}-defaultrole
namespace: {{ .Release.Namespace }}
roleRef:
kind: Role
name: {{ include "api.fullname" . }}-api-jobmanager
apiGroup: rbac.authorization.k8s.io
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "api.fullname" . }}-qs-jobmanager
namespace: {{ .Values.queue.qsJobNamespace }}
labels:
{{ include "api.labels" . | indent 4 }}
subjects:
- kind: ServiceAccount
name: {{ include "api.fullname" . }}-defaultrole
namespace: {{ .Release.Namespace }}
roleRef:
kind: Role
name: {{ include "api.fullname" . }}-qs-jobmanager
apiGroup: rbac.authorization.k8s.io
1 change: 1 addition & 0 deletions charts/api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ replicaCount:

queue:
apiJobNamespace: api-jobs
qsJobNamespace: qs-jobs
# a list of integers defining the delays for backing off when retrying
# failed jobs from the queue. E.g. `[10,100,1000]`
backoff: []
Expand Down
Loading