From 32fdfbcd5a36df8f445ab64e88a06d172bae1b62 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sun, 2 Sep 2018 11:51:28 +0800 Subject: [PATCH] cephfs-provisioner: Upgrade to v2.1.0-k8s1.11 Upstream Changes: - cephfs-provisioner v2.1.0-k8s1.11 (https://github.com/kubernetes-incubator/external-storage/releases/tag/cephfs-provisioner-v2.1.0-k8s1.11) Our Changes: - Sync clusterrole and role with upstream changes --- README.md | 2 +- roles/download/defaults/main.yml | 2 +- .../clusterrole-cephfs-provisioner.yml.j2 | 15 ++++----------- .../templates/role-cephfs-provisioner.yml.j2 | 3 +++ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 079cee527..c3913568a 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Supported Components - [flanneld](https://github.com/coreos/flannel) v0.10.0 - [weave](https://github.com/weaveworks/weave) v2.4.0 - Application - - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.0.1-k8s1.11 + - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11 - [cert-manager](https://github.com/jetstack/cert-manager) v0.4.1 - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.18.0 diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index a21881758..8e39d066e 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -149,7 +149,7 @@ registry_proxy_image_tag: "0.4" local_volume_provisioner_image_repo: "quay.io/external_storage/local-volume-provisioner" local_volume_provisioner_image_tag: "v2.1.0" cephfs_provisioner_image_repo: "quay.io/external_storage/cephfs-provisioner" -cephfs_provisioner_image_tag: "v2.0.1-k8s1.11" +cephfs_provisioner_image_tag: "v2.1.0-k8s1.11" ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller" ingress_nginx_controller_image_tag: "0.18.0" ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend" diff --git a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/clusterrole-cephfs-provisioner.yml.j2 b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/clusterrole-cephfs-provisioner.yml.j2 index 359d61a40..4c92ea68e 100644 --- a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/clusterrole-cephfs-provisioner.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/clusterrole-cephfs-provisioner.yml.j2 @@ -17,17 +17,10 @@ rules: - apiGroups: [""] resources: ["events"] verbs: ["create", "update", "patch"] - - apiGroups: [""] - resources: ["endpoints"] - verbs: ["get", "list", "watch", "create", "update", "patch"] - apiGroups: [""] resources: ["secrets"] verbs: ["get", "create", "delete"] - - apiGroups: - - policy - resourceNames: - - cephfs-provisioner - resources: - - podsecuritypolicies - verbs: - - use + - apiGroups: ["policy"] + resourceNames: ["cephfs-provisioner"] + resources: ["podsecuritypolicies"] + verbs: ["use"] diff --git a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/role-cephfs-provisioner.yml.j2 b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/role-cephfs-provisioner.yml.j2 index fb18127f2..1fb80a13a 100644 --- a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/role-cephfs-provisioner.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/role-cephfs-provisioner.yml.j2 @@ -8,3 +8,6 @@ rules: - apiGroups: [""] resources: ["secrets"] verbs: ["create", "get", "delete"] + - apiGroups: [""] + resources: ["endpoints"] + verbs: ["get", "list", "watch", "create", "update", "patch"]