From 6a0dfd3ce0621791ac36db35f89c5cc5c8af3ee2 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Mon, 19 Oct 2020 10:32:32 +0200 Subject: [PATCH 1/2] Update Rbac api versions Signed-off-by: faizanahmad055 --- .../kubernetes/chart/reloader/templates/clusterrole.yaml | 2 +- .../chart/reloader/templates/clusterrolebinding.yaml | 2 +- deployments/kubernetes/chart/reloader/templates/role.yaml | 2 +- .../kubernetes/chart/reloader/templates/rolebinding.yaml | 2 +- deployments/kubernetes/manifests/clusterrole.yaml | 2 +- deployments/kubernetes/manifests/clusterrolebinding.yaml | 2 +- deployments/kubernetes/reloader.yaml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml index 8d51ef40..8b5b451d 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml @@ -1,5 +1,5 @@ {{- if and .Values.reloader.watchGlobally (.Values.reloader.rbac.enabled) }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml index 28c9d4b9..8a2e0150 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml @@ -1,5 +1,5 @@ {{- if and .Values.reloader.watchGlobally (.Values.reloader.rbac.enabled) }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml index 5827f5cd..cbd59794 100644 --- a/deployments/kubernetes/chart/reloader/templates/role.yaml +++ b/deployments/kubernetes/chart/reloader/templates/role.yaml @@ -1,5 +1,5 @@ {{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml index 94fb1f83..08868f0e 100644 --- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml @@ -1,5 +1,5 @@ {{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index 10a0aaf7..72bf2fa1 100644 --- a/deployments/kubernetes/manifests/clusterrole.yaml +++ b/deployments/kubernetes/manifests/clusterrole.yaml @@ -1,7 +1,7 @@ --- # Source: reloader/templates/clusterrole.yaml -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: diff --git a/deployments/kubernetes/manifests/clusterrolebinding.yaml b/deployments/kubernetes/manifests/clusterrolebinding.yaml index 92e5b5c3..fe06f646 100644 --- a/deployments/kubernetes/manifests/clusterrolebinding.yaml +++ b/deployments/kubernetes/manifests/clusterrolebinding.yaml @@ -1,7 +1,7 @@ --- # Source: reloader/templates/clusterrolebinding.yaml -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index 2db8b45e..828c30e2 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -1,7 +1,7 @@ --- # Source: reloader/templates/clusterrole.yaml -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: @@ -46,7 +46,7 @@ rules: --- # Source: reloader/templates/clusterrolebinding.yaml -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: From faf27c2d5d04d8097b288dc8f6569a340ea4593e Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Mon, 19 Oct 2020 16:00:54 +0200 Subject: [PATCH 2/2] Add support for legacy rbac Signed-off-by: faizanahmad055 --- README.md | 7 +++++++ .../kubernetes/chart/reloader/templates/clusterrole.yaml | 4 ++++ .../chart/reloader/templates/clusterrolebinding.yaml | 4 ++++ deployments/kubernetes/chart/reloader/templates/role.yaml | 4 ++++ .../kubernetes/chart/reloader/templates/rolebinding.yaml | 4 ++++ deployments/kubernetes/chart/reloader/values.yaml | 2 ++ 6 files changed, 25 insertions(+) diff --git a/README.md b/README.md index a41c25fd..0c4b1d9d 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Reloader can watch changes in `ConfigMap` and `Secret` and do rolling upgrades o ## Compatibility Reloader is compatible with kubernetes >= 1.9 +The `apiVersion: rbac.authorization.k8s.io/v1beta1` is depreciated since kubernetes = 1.17. To run it with older versions, please use the chart parameter `reloader.legacy.rbac=true` ## How to use Reloader @@ -201,6 +202,12 @@ helm repo update helm install stakater/reloader ``` +**Note:** The latest verion of reloader is using `apiVersion: rbac.authorization.k8s.io/v1` for rbac. The `apiVersion: rbac.authorization.k8s.io/v1beta1` is depreciated since kubernetes = 1.17. To run it with older versions, please use below command. + +```bash +helm install stakater/reloader --set reloader.legacy.rbac=true +``` + **Note:** By default reloader watches in all namespaces. To watch in single namespace, please run following command. It will install reloader in `test` namespace which will only watch `Deployments`, `Daemonsets` and `Statefulsets` in `test` namespace. ```bash diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml index 8b5b451d..db523393 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml @@ -1,5 +1,9 @@ {{- if and .Values.reloader.watchGlobally (.Values.reloader.rbac.enabled) }} +{{- if and .Values.reloader.legacy.rbac }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +{{ else }} apiVersion: rbac.authorization.k8s.io/v1 +{{- end }} kind: ClusterRole metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml index 8a2e0150..65d5f921 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml @@ -1,5 +1,9 @@ {{- if and .Values.reloader.watchGlobally (.Values.reloader.rbac.enabled) }} +{{- if and .Values.reloader.legacy.rbac }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +{{ else }} apiVersion: rbac.authorization.k8s.io/v1 +{{- end }} kind: ClusterRoleBinding metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml index cbd59794..68263d65 100644 --- a/deployments/kubernetes/chart/reloader/templates/role.yaml +++ b/deployments/kubernetes/chart/reloader/templates/role.yaml @@ -1,5 +1,9 @@ {{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }} +{{- if and .Values.reloader.legacy.rbac }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +{{ else }} apiVersion: rbac.authorization.k8s.io/v1 +{{- end }} kind: Role metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml index 08868f0e..a7d27284 100644 --- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml @@ -1,5 +1,9 @@ {{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }} +{{- if and .Values.reloader.legacy.rbac }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +{{ else }} apiVersion: rbac.authorization.k8s.io/v1 +{{- end }} kind: RoleBinding metadata: labels: diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index b37c5f51..756f52b2 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -17,6 +17,8 @@ reloader: watchGlobally: true # Set to true if you have a pod security policy that enforces readOnlyRootFilesystem readOnlyRootFileSystem: false + legacy: + rbac: false matchLabels: {} deployment: nodeSelector: