From 20a4ac9f2fe77a620190af86fa315e2ebf42d01b Mon Sep 17 00:00:00 2001 From: Prajyot-Parab Date: Tue, 7 Mar 2023 14:37:42 +0530 Subject: [PATCH 1/2] Fix lower_priority syntax for latest ansible versions Signed-off-by: Prajyot-Parab --- tasks/setup_keepalived.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/setup_keepalived.yaml b/tasks/setup_keepalived.yaml index 47185dc9..b77d9328 100644 --- a/tasks/setup_keepalived.yaml +++ b/tasks/setup_keepalived.yaml @@ -20,7 +20,7 @@ - name: Set low_priority fact set_fact: - low_priority: "{{ low_priority | default([]) }} + [ {{ item.priority }} ]" + low_priority: "{{ low_priority | default([]) + [ item.priority ] }}" with_items: - "{{ high_availability.helpernodes }}" when: item.state == "BACKUP" From 44d3ed38d04fa7e7ee23c580ee2fba399537b938 Mon Sep 17 00:00:00 2001 From: Sebastien Chabrolles Date: Thu, 20 Apr 2023 08:47:56 +0200 Subject: [PATCH 2/2] nfs_provisioner_image --- docs/vars-doc.md | 6 ++++++ templates/nfs-provisioner-deployment.yaml.j2 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/vars-doc.md b/docs/vars-doc.md index e4529d90..98bc4e74 100644 --- a/docs/vars-doc.md +++ b/docs/vars-doc.md @@ -347,6 +347,12 @@ ppc64le: true ### NFS Configuration +``` +nfs_provisioner_image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.0 +``` + +* `nfs_provisioner_image` - Set the nfs_provisioner image to use. (default: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.0) + This playbook sets up a script called [helpernodecheck](../templates/checker.sh.j2). That script can be used to set up the helpernode as an NFS server (this is the default). It uses the [k8s nfs setup in the incubator repo](https://github.com/kubernetes-incubator/external-storage/blob/master/nfs-client/README.md). > :warning: Run `helpernodecheck nfs-info` for information after the playbook runs. diff --git a/templates/nfs-provisioner-deployment.yaml.j2 b/templates/nfs-provisioner-deployment.yaml.j2 index 39da54bd..08e59aab 100644 --- a/templates/nfs-provisioner-deployment.yaml.j2 +++ b/templates/nfs-provisioner-deployment.yaml.j2 @@ -20,7 +20,7 @@ spec: {% if setup_registry.deploy and setup_registry.autosync_registry %} image: registry.{{ dns.clusterid }}.{{ dns.domain }}:5000/nfs-client-provisioner:latest {% else %} - image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.0 + image: "{{ nfs_provisioner_image | default("gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.0") }}" {% endif %} volumeMounts: - name: nfs-client-root