C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3120 from alvistack/cephfs-provisioner-v2.0.0-k8s1.11

Browse source 
cephfs-provisioner: Upgrade to v2.0.0-k8s1.11
This commit is contained in:
Antoine Legrand 2018-08-17 22:11:15 +02:00 committed by GitHub
commit c36744e96d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -102,7 +102,7 @@ Supported Components
- [flanneld](https://github.com/coreos/flannel) v0.10.0 - [flanneld](https://github.com/coreos/flannel) v0.10.0
- [weave](https://github.com/weaveworks/weave) v2.4.0 - [weave](https://github.com/weaveworks/weave) v2.4.0
- Application - Application
- [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v1.1.0-k8s1.10 - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.0.0-k8s1.11
- [cert-manager](https://github.com/jetstack/cert-manager) v0.4.1 - [cert-manager](https://github.com/jetstack/cert-manager) v0.4.1
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.18.0 - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.18.0

2
roles/download/defaults/main.yml
View file

@ -139,7 +139,7 @@ registry_proxy_image_tag: "0.4"
local_volume_provisioner_image_repo: "quay.io/external_storage/local-volume-provisioner" local_volume_provisioner_image_repo: "quay.io/external_storage/local-volume-provisioner"
local_volume_provisioner_image_tag: "v2.1.0" local_volume_provisioner_image_tag: "v2.1.0"
cephfs_provisioner_image_repo: "quay.io/external_storage/cephfs-provisioner" cephfs_provisioner_image_repo: "quay.io/external_storage/cephfs-provisioner"
cephfs_provisioner_image_tag: "v1.1.0-k8s1.10" cephfs_provisioner_image_tag: "v2.0.0-k8s1.11"
ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller" ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
ingress_nginx_controller_image_tag: "0.18.0" ingress_nginx_controller_image_tag: "0.18.0"
ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend" ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"

2
roles/kubernetes-apps/external_provisioner/cephfs_provisioner/tasks/main.yml
View file

@ -49,7 +49,7 @@
- { name: clusterrolebinding-cephfs-provisioner, file: clusterrolebinding-cephfs-provisioner.yml, type: clusterrolebinding } - { name: clusterrolebinding-cephfs-provisioner, file: clusterrolebinding-cephfs-provisioner.yml, type: clusterrolebinding }
- { name: role-cephfs-provisioner, file: role-cephfs-provisioner.yml, type: role } - { name: role-cephfs-provisioner, file: role-cephfs-provisioner.yml, type: role }
- { name: rolebinding-cephfs-provisioner, file: rolebinding-cephfs-provisioner.yml, type: rolebinding } - { name: rolebinding-cephfs-provisioner, file: rolebinding-cephfs-provisioner.yml, type: rolebinding }
- { name: deploy-cephfs-provisioner, file: deploy-cephfs-provisioner.yml, type: rs } - { name: deploy-cephfs-provisioner, file: deploy-cephfs-provisioner.yml, type: deploy }
- { name: sc-cephfs-provisioner, file: sc-cephfs-provisioner.yml, type: sc } - { name: sc-cephfs-provisioner, file: sc-cephfs-provisioner.yml, type: sc }
register: cephfs_provisioner_manifests register: cephfs_provisioner_manifests
when: inventory_hostname == groups['kube-master'][0] when: inventory_hostname == groups['kube-master'][0]

5
roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/clusterrole-cephfs-provisioner.yml.j2
View file

@ -16,7 +16,10 @@ rules:
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["events"] resources: ["events"]
verbs: ["list", "watch", "create", "update", "patch"] verbs: ["create", "update", "patch"]
- apiGroups: [""]
resources: ["endpoints"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["secrets"] resources: ["secrets"]
verbs: ["get", "create", "delete"] verbs: ["get", "create", "delete"]

1
roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/clusterrolebinding-cephfs-provisioner.yml.j2
View file

@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: cephfs-provisioner name: cephfs-provisioner
namespace: {{ cephfs_provisioner_namespace }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: cephfs-provisioner name: cephfs-provisioner

20
roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
View file

@ -2,23 +2,26 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: cephfs-provisioner-v{{ cephfs_provisioner_image_tag }} name: cephfs-provisioner-{{ cephfs_provisioner_image_tag }}
namespace: {{ cephfs_provisioner_namespace }} namespace: {{ cephfs_provisioner_namespace }}
labels: labels:
k8s-app: cephfs-provisioner app: cephfs-provisioner
version: v{{ cephfs_provisioner_image_tag }} version: {{ cephfs_provisioner_image_tag }}
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: cephfs-provisioner app: cephfs-provisioner
version: v{{ cephfs_provisioner_image_tag }} version: {{ cephfs_provisioner_image_tag }}
template: template:
metadata: metadata:
labels: labels:
k8s-app: cephfs-provisioner app: cephfs-provisioner
version: v{{ cephfs_provisioner_image_tag }} version: {{ cephfs_provisioner_image_tag }}
spec: spec:
{% if rbac_enabled %}
serviceAccount: cephfs-provisioner
{% endif %}
containers: containers:
- name: cephfs-provisioner - name: cephfs-provisioner
image: {{ cephfs_provisioner_image_repo }}:{{ cephfs_provisioner_image_tag }} image: {{ cephfs_provisioner_image_repo }}:{{ cephfs_provisioner_image_tag }}
@ -30,6 +33,3 @@ spec:
- "/usr/local/bin/cephfs-provisioner" - "/usr/local/bin/cephfs-provisioner"
args: args:
- "-id=cephfs-provisioner-1" - "-id=cephfs-provisioner-1"
{% if rbac_enabled %}
serviceAccount: cephfs-provisioner
{% endif %}