adrien/ansible-role-k8s-storage
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update from upstream
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Adrien Reslinger 2020-10-10 13:11:17 +02:00
parent d6672663b0
commit 2be4c03df1
8 changed files with 178 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/update.sh
View file

@ -33,7 +33,8 @@ wget https://raw.githubusercontent.com/linode/linode-blockstorage-csi-driver/mas
kubernetes-split-yaml linode-blockstorage-csi-driver.yaml > generated.log
mv files/linode{,.old}
mv generated files/linode
cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "linode/\2"|'
echo -e "---\nstorage_linode_files_list:" > vars/linode.yaml
cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "linode/\2"|' >> vars/linode.yaml
sed -e /is-default-class/d -e /annotations/d -i files/linode/linode-block-storage-StorageClass.yaml
sed -e /is-default-class/d -e /annotations/d -i files/linode/linode-block-storage-retain-StorageClass.yaml
rm -fr files/linode.old generated.log linode-blockstorage-csi-driver.yaml
@ -42,11 +43,12 @@ rm -fr files/linode.old generated.log linode-blockstorage-csi-driver.yaml
DO_CSI_VERSION=2.0.0
mv files/digitalocean{,.old}
mkdir files/digitalocean
echo -e "---\nstorage_linode_files_list:" > vars/digitalocean.yaml
for FICHIER in crds.yaml driver.yaml snapshot-controller.yaml; do
wget https://github.com/digitalocean/csi-digitalocean/raw/master/deploy/kubernetes/releases/csi-digitalocean-v${DO_CSI_VERSION}/$FICHIER
kubernetes-split-yaml $FICHIER >> generated.log
mv generated/* files/digitalocean/
cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "digitalocean/\2"|'
cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "digitalocean/\2"|' >> vars/digitalocean.yaml
rm -f $FICHIER generated.log
done
for i in do-block-storage-StorageClass.yaml do-block-storage-VolumeSnapshotClass.yaml; do

27
files/secrets-store/csi-secrets-store-DaemonSet.yaml
View file

@ -42,14 +42,23 @@ spec:
mountPath: /csi
- name: registration-dir
mountPath: /registration
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 10m
memory: 20Mi
- name: secrets-store
image: us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver:v0.0.13
image: us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver:v0.0.16
args:
- "--debug=true"
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
- "--provider-volume=/etc/kubernetes/secrets-store-csi-providers"
- "--metrics-addr=:8080"
- "--metrics-addr=:8095"
- "--enable-secret-rotation=false"
- "--rotation-poll-interval=2m"
env:
- name: CSI_ENDPOINT
value: unix:///csi/csi.sock
@ -81,6 +90,13 @@ spec:
mountPropagation: Bidirectional
- name: providers-dir
mountPath: /etc/kubernetes/secrets-store-csi-providers
resources:
limits:
cpu: 200m
memory: 200Mi
requests:
cpu: 50m
memory: 100Mi
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v2.0.0
imagePullPolicy: Always
@ -92,6 +108,13 @@ spec:
volumeMounts:
- name: plugin-dir
mountPath: /csi
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 10m
memory: 20Mi
volumes:
- name: mountpoint-dir
hostPath:

15
files/secrets-store/secretproviderclasses-role-ClusterRole.yaml
View file

@ -4,6 +4,21 @@ metadata:
creationTimestamp: null
name: secretproviderclasses-role
rules:
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
- apiGroups:
- secrets-store.csi.x-k8s.io
resources:

16
files/secrets-store/secretproviderclasses.secrets-store.csi.x-k8s.io-CustomResourceDefinition.yaml
View file

@ -1,8 +1,8 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
name: secretproviderclasses.secrets-store.csi.x-k8s.io
spec:
@ -12,9 +12,10 @@ spec:
listKind: SecretProviderClassList
plural: secretproviderclasses
singular: secretproviderclass
preserveUnknownFields: false
scope: Namespaced
validation:
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: SecretProviderClass is the Schema for the secretproviderclasses
API
@ -49,8 +50,8 @@ spec:
properties:
data:
items:
description: SecretObjectData defines the desired state of synced
K8s secret object data
description: SecretObjectData defines the desired state of
synced K8s secret object data
properties:
key:
description: data field to populate
@ -92,9 +93,6 @@ spec:
type: array
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:

28
tasks/digital_ocean.yml
View file

@ -1,5 +1,8 @@
---
# https://github.com/digitalocean/csi-digitalocean
- name: Include file list
include_vars: "digitalocean.yaml"
- name: Defined digitalocean-storage state to present
set_fact:
storage_digitalocean_state: present
@ -33,27 +36,4 @@
merge_type: merge
resource_definition: "{{ lookup('file', item) | from_yaml }}"
with_items:
- "digitalocean/volumesnapshotclasses.snapshot.storage.k8s.io-CustomResourceDefinition.yaml"
- "digitalocean/volumesnapshotcontents.snapshot.storage.k8s.io-CustomResourceDefinition.yaml"
- "digitalocean/volumesnapshots.snapshot.storage.k8s.io-CustomResourceDefinition.yaml"
- "digitalocean/dobs.csi.digitalocean.com-CSIDriver.yaml"
- "digitalocean/do-block-storage-VolumeSnapshotClass.yaml"
- "digitalocean/do-block-storage-StorageClass.yaml"
- "digitalocean/csi-do-controller-StatefulSet.yaml"
- "digitalocean/csi-do-controller-sa-ServiceAccount.yaml"
- "digitalocean/csi-do-provisioner-role-ClusterRole.yaml"
- "digitalocean/csi-do-provisioner-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-attacher-role-ClusterRole.yaml"
- "digitalocean/csi-do-attacher-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-snapshotter-role-ClusterRole.yaml"
- "digitalocean/csi-do-snapshotter-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-resizer-role-ClusterRole.yaml"
- "digitalocean/csi-do-resizer-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-node-DaemonSet.yaml"
- "digitalocean/csi-do-node-sa-ServiceAccount.yaml"
- "digitalocean/csi-do-node-driver-registrar-role-ClusterRole.yaml"
- "digitalocean/csi-do-node-driver-registrar-binding-ClusterRoleBinding.yaml"
- "digitalocean/snapshot-controller-StatefulSet.yaml"
- "digitalocean/snapshot-controller-ServiceAccount.yaml"
- "digitalocean/snapshot-controller-role-ClusterRole.yaml"
- "digitalocean/snapshot-controller-binding-ClusterRoleBinding.yaml"
- "{{ storage_digitalocean_files_list }}"

22
tasks/linode.yml
View file

@ -1,5 +1,8 @@
---
# https://github.com/linode/linode-blockstorage-csi-driver
- name: Include file list
include_vars: "linode.yaml"
- name: Defined linode-storage state to present
set_fact:
storage_linode_state: present
@ -34,21 +37,4 @@
merge_type: merge
resource_definition: "{{ lookup('file', item) | from_yaml }}"
with_items:
- "linode/csinodeinfos.csi.storage.k8s.io-CustomResourceDefinition.yaml"
- "linode/csidrivers.csi.storage.k8s.io-CustomResourceDefinition.yaml"
- "linode/csi-node-sa-ServiceAccount.yaml"
- "linode/driver-registrar-role-ClusterRole.yaml"
- "linode/driver-registrar-binding-ClusterRoleBinding.yaml"
- "linode/csi-controller-sa-ServiceAccount.yaml"
- "linode/external-provisioner-role-ClusterRole.yaml"
- "linode/csi-controller-provisioner-binding-ClusterRoleBinding.yaml"
- "linode/external-attacher-role-ClusterRole.yaml"
- "linode/csi-controller-attacher-binding-ClusterRoleBinding.yaml"
- "linode/external-snapshotter-role-ClusterRole.yaml"
- "linode/csi-controller-snapshotter-binding-ClusterRoleBinding.yaml"
- "linode/linodebs.csi.linode.com-CSIDriver.yaml"
- "linode/linode-block-storage-StorageClass.yaml"
- "linode/linode-block-storage-retain-StorageClass.yaml"
- "linode/csi-linode-controller-StatefulSet.yaml"
- "linode/csi-linode-node-DaemonSet.yaml"
- "linode/get-linode-id-ConfigMap.yaml"
- "{{ storage_linode_files_list }}"

26
vars/digitalocean.yaml Normal file
View file

@ -0,0 +1,26 @@
---
storage_linode_files_list:
- "digitalocean/volumesnapshotclasses.snapshot.storage.k8s.io-CustomResourceDefinition.yaml"
- "digitalocean/volumesnapshotcontents.snapshot.storage.k8s.io-CustomResourceDefinition.yaml"
- "digitalocean/volumesnapshots.snapshot.storage.k8s.io-CustomResourceDefinition.yaml"
- "digitalocean/dobs.csi.digitalocean.com-CSIDriver.yaml"
- "digitalocean/do-block-storage-VolumeSnapshotClass.yaml"
- "digitalocean/do-block-storage-StorageClass.yaml"
- "digitalocean/csi-do-controller-StatefulSet.yaml"
- "digitalocean/csi-do-controller-sa-ServiceAccount.yaml"
- "digitalocean/csi-do-provisioner-role-ClusterRole.yaml"
- "digitalocean/csi-do-provisioner-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-attacher-role-ClusterRole.yaml"
- "digitalocean/csi-do-attacher-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-snapshotter-role-ClusterRole.yaml"
- "digitalocean/csi-do-snapshotter-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-resizer-role-ClusterRole.yaml"
- "digitalocean/csi-do-resizer-binding-ClusterRoleBinding.yaml"
- "digitalocean/csi-do-node-DaemonSet.yaml"
- "digitalocean/csi-do-node-sa-ServiceAccount.yaml"
- "digitalocean/csi-do-node-driver-registrar-role-ClusterRole.yaml"
- "digitalocean/csi-do-node-driver-registrar-binding-ClusterRoleBinding.yaml"
- "digitalocean/snapshot-controller-StatefulSet.yaml"
- "digitalocean/snapshot-controller-ServiceAccount.yaml"
- "digitalocean/snapshot-controller-role-ClusterRole.yaml"
- "digitalocean/snapshot-controller-binding-ClusterRoleBinding.yaml"

20
vars/linode.yaml Normal file
View file

@ -0,0 +1,20 @@
---
storage_linode_files_list:
- "linode/csinodeinfos.csi.storage.k8s.io-CustomResourceDefinition.yaml"
- "linode/csidrivers.csi.storage.k8s.io-CustomResourceDefinition.yaml"
- "linode/csi-node-sa-ServiceAccount.yaml"
- "linode/driver-registrar-role-ClusterRole.yaml"
- "linode/driver-registrar-binding-ClusterRoleBinding.yaml"
- "linode/csi-controller-sa-ServiceAccount.yaml"
- "linode/external-provisioner-role-ClusterRole.yaml"
- "linode/csi-controller-provisioner-binding-ClusterRoleBinding.yaml"
- "linode/external-attacher-role-ClusterRole.yaml"
- "linode/csi-controller-attacher-binding-ClusterRoleBinding.yaml"
- "linode/external-snapshotter-role-ClusterRole.yaml"
- "linode/csi-controller-snapshotter-binding-ClusterRoleBinding.yaml"
- "linode/linodebs.csi.linode.com-CSIDriver.yaml"
- "linode/linode-block-storage-StorageClass.yaml"
- "linode/linode-block-storage-retain-StorageClass.yaml"
- "linode/csi-linode-controller-StatefulSet.yaml"
- "linode/csi-linode-node-DaemonSet.yaml"
- "linode/get-linode-id-ConfigMap.yaml"