Browse Source

parameterized snaphot controller namespaces (#8305)

* Parameterized snaphot controller namespaces

* add ns yml

* add docs

* namespace
pull/8433/head
Samuel Liu 2 years ago
committed by GitHub
parent
commit
1a69f8c3ad
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 6 deletions
  1. 2
      inventory/sample/group_vars/k8s_cluster/addons.yml
  2. 1
      roles/kubernetes-apps/snapshots/snapshot-controller/defaults/main.yml
  3. 1
      roles/kubernetes-apps/snapshots/snapshot-controller/tasks/main.yml
  4. 10
      roles/kubernetes-apps/snapshots/snapshot-controller/templates/rbac-snapshot-controller.yml.j2
  5. 2
      roles/kubernetes-apps/snapshots/snapshot-controller/templates/snapshot-controller.yml.j2
  6. 7
      roles/kubernetes-apps/snapshots/snapshot-controller/templates/snapshot-ns.yml.j2

2
inventory/sample/group_vars/k8s_cluster/addons.yml

@ -57,6 +57,8 @@ local_volume_provisioner_enabled: false
# currently, setting cinder_csi_enabled=true would automatically enable the snapshot controller
# Longhorn is an extenal CSI that would also require setting this to true but it is not included in kubespray
# csi_snapshot_controller_enabled: false
# csi snapshot namespace
# snapshot_controller_namespace: kube-system
# CephFS provisioner deployment
cephfs_provisioner_enabled: false

1
roles/kubernetes-apps/snapshots/snapshot-controller/defaults/main.yml

@ -1,2 +1,3 @@
---
snapshot_controller_replicas: 1
snapshot_controller_namespace: kube-system

1
roles/kubernetes-apps/snapshots/snapshot-controller/tasks/main.yml

@ -5,6 +5,7 @@
dest: "{{ kube_config_dir }}/{{ item.file }}"
mode: 0644
with_items:
- {name: snapshot-ns, file: snapshot-ns.yml}
- {name: rbac-snapshot-controller, file: rbac-snapshot-controller.yml}
- {name: snapshot-controller, file: snapshot-controller.yml}
register: snapshot_controller_manifests

10
roles/kubernetes-apps/snapshots/snapshot-controller/templates/rbac-snapshot-controller.yml.j2

@ -9,7 +9,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: snapshot-controller
namespace: kube-system
namespace: {{ snapshot_controller_namespace }}
---
kind: ClusterRole
@ -51,7 +51,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: snapshot-controller
namespace: kube-system
namespace: {{ snapshot_controller_namespace }}
roleRef:
kind: ClusterRole
# change the name also here if the ClusterRole gets renamed
@ -62,7 +62,7 @@ roleRef:
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
namespace: kube-system
namespace: {{ snapshot_controller_namespace }}
name: snapshot-controller-leaderelection
rules:
- apiGroups: ["coordination.k8s.io"]
@ -74,11 +74,11 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: snapshot-controller-leaderelection
namespace: kube-system
namespace: {{ snapshot_controller_namespace }}
subjects:
- kind: ServiceAccount
name: snapshot-controller
namespace: kube-system
namespace: {{ snapshot_controller_namespace }}
roleRef:
kind: Role
name: snapshot-controller-leaderelection

2
roles/kubernetes-apps/snapshots/snapshot-controller/templates/snapshot-controller.yml.j2

@ -10,7 +10,7 @@ kind: Deployment
apiVersion: apps/v1
metadata:
name: snapshot-controller
namespace: kube-system
namespace: {{ snapshot_controller_namespace }}
spec:
replicas: {{ snapshot_controller_replicas }}
selector:

7
roles/kubernetes-apps/snapshots/snapshot-controller/templates/snapshot-ns.yml.j2

@ -0,0 +1,7 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: {{ snapshot_controller_namespace }}
labels:
name: {{ snapshot_controller_namespace }}
Loading…
Cancel
Save