From f6c1f9924f0ef48aaa85996eed291c39b1c68d10 Mon Sep 17 00:00:00 2001 From: Kevin Pullin Date: Tue, 22 Jan 2019 22:33:32 -0800 Subject: [PATCH] EFS - Grant 'endpoints' access (#9127) * EFS ClusterRole - Grant access to 'endpoint' resources Signed-off-by: Kevin Pullin * Do not create EFS deployment if default EFS id set Signed-off-by: Kevin Pullin * Bump efs-provisioner chart version Signed-off-by: Kevin Pullin * Fix indentation from github UI conflict edit Signed-off-by: Kevin Pullin --- stable/efs-provisioner/Chart.yaml | 4 ++-- .../efs-provisioner/templates/clusterrole.yaml | 3 +++ stable/efs-provisioner/templates/deployment.yaml | 16 ++++++++-------- stable/efs-provisioner/values.yaml | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/stable/efs-provisioner/Chart.yaml b/stable/efs-provisioner/Chart.yaml index b71467edee..7e6d94777e 100644 --- a/stable/efs-provisioner/Chart.yaml +++ b/stable/efs-provisioner/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: efs-provisioner description: A Helm chart for the AWS EFS external storage provisioner -version: 0.1.3 -appVersion: v0.1.2 +version: 0.1.4 +appVersion: v2.1.0-k8s1.11 home: https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs sources: - https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs diff --git a/stable/efs-provisioner/templates/clusterrole.yaml b/stable/efs-provisioner/templates/clusterrole.yaml index 59a9ab1427..e9bd0257b5 100644 --- a/stable/efs-provisioner/templates/clusterrole.yaml +++ b/stable/efs-provisioner/templates/clusterrole.yaml @@ -24,4 +24,7 @@ rules: - apiGroups: [""] resources: ["events"] verbs: ["list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["endpoints"] + verbs: ["get", "list", "watch", "create", "update", "patch"] {{- end }} diff --git a/stable/efs-provisioner/templates/deployment.yaml b/stable/efs-provisioner/templates/deployment.yaml index 903d4c77ba..acccd0e977 100644 --- a/stable/efs-provisioner/templates/deployment.yaml +++ b/stable/efs-provisioner/templates/deployment.yaml @@ -1,13 +1,13 @@ - {{- if ne .Values.efsProvisioner.efsFileSystemId "fs-12345678" }} - {{/* - The `efsFileSystemId` value must be set. +{{- if ne .Values.efsProvisioner.efsFileSystemId "fs-12345678" }} +{{/* +The `efsFileSystemId` value must be set. - The above `if` condition also prevents the helm integration tests from failing. - Given that the helm test infrastructure does not have access to valid - AWS EFS resources, a deployment that references the example `fs-12345678` - creates pods that will never enter a clean, running state. +The above `if` condition also prevents the helm integration tests from failing. +Given that the helm test infrastructure does not have access to valid +AWS EFS resources, a deployment that references the example `fs-12345678` +creates pods that will never enter a clean, running state. - Omitting the deployment hacks around this limitation. +Omitting the deployment hacks around this limitation. */}} kind: Deployment apiVersion: apps/v1beta2 diff --git a/stable/efs-provisioner/values.yaml b/stable/efs-provisioner/values.yaml index c568533405..fb0891fc86 100644 --- a/stable/efs-provisioner/values.yaml +++ b/stable/efs-provisioner/values.yaml @@ -14,7 +14,7 @@ replicaCount: 1 revisionHistoryLimit: 10 image: repository: quay.io/external_storage/efs-provisioner - tag: v0.1.2 + tag: v2.1.0-k8s1.11 pullPolicy: IfNotPresent busyboxImage: