From 0b4653b7dcdd734d321f32e5d228c7db053d6bc6 Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 9 Oct 2018 07:36:18 +0600 Subject: [PATCH] [stable/kiam] Added 3.0 rc1 version support (#7235) * Merge commits to signthem Signed-off-by: Igor Rodionov * Fix Readme Signed-off-by: Igor Rodionov --- stable/kiam/Chart.yaml | 4 ++-- stable/kiam/templates/agent-daemonset.yaml | 3 ++- stable/kiam/templates/server-daemonset.yaml | 9 +++++--- ...role.yaml => server-read-clusterrole.yaml} | 2 +- ...ml => server-read-clusterrolebinding.yaml} | 4 ++-- .../templates/server-write-clusterrole.yaml | 21 ++++++++++++++++++ .../server-write-clusterrolebinding.yaml | 22 +++++++++++++++++++ stable/kiam/values.yaml | 4 ++-- 8 files changed, 58 insertions(+), 11 deletions(-) rename stable/kiam/templates/{server-clusterrole.yaml => server-read-clusterrole.yaml} (91%) rename stable/kiam/templates/{server-clusterrolebinding.yaml => server-read-clusterrolebinding.yaml} (85%) create mode 100644 stable/kiam/templates/server-write-clusterrole.yaml create mode 100644 stable/kiam/templates/server-write-clusterrolebinding.yaml diff --git a/stable/kiam/Chart.yaml b/stable/kiam/Chart.yaml index 4767bb1660..eb4c2a3b89 100644 --- a/stable/kiam/Chart.yaml +++ b/stable/kiam/Chart.yaml @@ -1,6 +1,6 @@ name: kiam -version: 1.2.2 -appVersion: 2.8 +version: 2.0.0-rc1 +appVersion: 3.0-rc1 description: Integrate AWS IAM with Kubernetes keywords: - kiam diff --git a/stable/kiam/templates/agent-daemonset.yaml b/stable/kiam/templates/agent-daemonset.yaml index f15fa6e5d2..d2fbf74b4b 100644 --- a/stable/kiam/templates/agent-daemonset.yaml +++ b/stable/kiam/templates/agent-daemonset.yaml @@ -62,7 +62,8 @@ spec: image: "{{ .Values.agent.image.repository }}:{{ .Values.agent.image.tag }}" imagePullPolicy: {{ .Values.agent.image.pullPolicy }} command: - - /agent + - /kiam + - agent args: {{- if .Values.agent.host.iptables }} - --iptables diff --git a/stable/kiam/templates/server-daemonset.yaml b/stable/kiam/templates/server-daemonset.yaml index 27a0456f42..e6d0152ca1 100644 --- a/stable/kiam/templates/server-daemonset.yaml +++ b/stable/kiam/templates/server-daemonset.yaml @@ -51,7 +51,8 @@ spec: image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}" imagePullPolicy: {{ .Values.server.image.pullPolicy }} command: - - /server + - /kiam + - server args: {{- if .Values.server.log.jsonOutput }} - --json-log @@ -100,7 +101,8 @@ spec: livenessProbe: exec: command: - - /health + - /kiam + - health - --cert=/etc/kiam/tls/cert - --key=/etc/kiam/tls/key - --ca=/etc/kiam/tls/ca @@ -114,7 +116,8 @@ spec: readinessProbe: exec: command: - - /health + - /kiam + - health - --cert=/etc/kiam/tls/cert - --key=/etc/kiam/tls/key - --ca=/etc/kiam/tls/ca diff --git a/stable/kiam/templates/server-clusterrole.yaml b/stable/kiam/templates/server-read-clusterrole.yaml similarity index 91% rename from stable/kiam/templates/server-clusterrole.yaml rename to stable/kiam/templates/server-read-clusterrole.yaml index f028f2e3e7..77841d3af8 100644 --- a/stable/kiam/templates/server-clusterrole.yaml +++ b/stable/kiam/templates/server-read-clusterrole.yaml @@ -9,7 +9,7 @@ metadata: component: "{{ .Values.server.name }}" heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "kiam.fullname" . }}-server + name: {{ template "kiam.fullname" . }}-read rules: - apiGroups: - "" diff --git a/stable/kiam/templates/server-clusterrolebinding.yaml b/stable/kiam/templates/server-read-clusterrolebinding.yaml similarity index 85% rename from stable/kiam/templates/server-clusterrolebinding.yaml rename to stable/kiam/templates/server-read-clusterrolebinding.yaml index a805a20714..0327baca45 100644 --- a/stable/kiam/templates/server-clusterrolebinding.yaml +++ b/stable/kiam/templates/server-read-clusterrolebinding.yaml @@ -9,11 +9,11 @@ metadata: component: "{{ .Values.server.name }}" heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "kiam.fullname" . }}-server + name: {{ template "kiam.fullname" . }}-read roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kiam.fullname" . }}-server + name: {{ template "kiam.fullname" . }}-read subjects: - kind: ServiceAccount name: {{ template "kiam.serviceAccountName.server" . }} diff --git a/stable/kiam/templates/server-write-clusterrole.yaml b/stable/kiam/templates/server-write-clusterrole.yaml new file mode 100644 index 0000000000..05ad474a7a --- /dev/null +++ b/stable/kiam/templates/server-write-clusterrole.yaml @@ -0,0 +1,21 @@ +{{- if .Values.server.enabled -}} +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRole +metadata: + labels: + app: {{ template "kiam.name" . }} + chart: {{ template "kiam.chart" . }} + component: "{{ .Values.server.name }}" + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} + name: {{ template "kiam.fullname" . }}-write +rules: + - apiGroups: + - "" + resources: + - events + verbs: + - create +{{- end -}} +{{- end -}} diff --git a/stable/kiam/templates/server-write-clusterrolebinding.yaml b/stable/kiam/templates/server-write-clusterrolebinding.yaml new file mode 100644 index 0000000000..2d4204e04d --- /dev/null +++ b/stable/kiam/templates/server-write-clusterrolebinding.yaml @@ -0,0 +1,22 @@ +{{- if .Values.server.enabled -}} +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + labels: + app: {{ template "kiam.name" . }} + chart: {{ template "kiam.chart" . }} + component: "{{ .Values.server.name }}" + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} + name: {{ template "kiam.fullname" . }}-write +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ template "kiam.fullname" . }}-write +subjects: + - kind: ServiceAccount + name: {{ template "kiam.serviceAccountName.server" . }} + namespace: {{ .Release.Namespace }} +{{- end -}} +{{- end }} diff --git a/stable/kiam/values.yaml b/stable/kiam/values.yaml index 07c1cfc816..d8f21166e9 100644 --- a/stable/kiam/values.yaml +++ b/stable/kiam/values.yaml @@ -11,7 +11,7 @@ agent: image: repository: quay.io/uswitch/kiam - tag: v2.8 + tag: v3.0-rc1 pullPolicy: IfNotPresent ## Logging settings @@ -98,7 +98,7 @@ server: image: repository: quay.io/uswitch/kiam - tag: v2.8 + tag: v3.0-rc1 pullPolicy: IfNotPresent ## Logging settings