From 532e97c5428542a0ac0f3d8d27827806654a1c2e Mon Sep 17 00:00:00 2001 From: elementyang Date: Fri, 28 Dec 2018 14:23:19 +0800 Subject: [PATCH 1/2] fix registry_storage_class equals empty string --- roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 index ac6a0dfda..df3bed9d7 100644 --- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 +++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 @@ -44,7 +44,7 @@ spec: protocol: TCP volumes: - name: registry-pvc -{% if registry_storage_class != none %} +{% if registry_storage_class != "" %} persistentVolumeClaim: claimName: registry-pvc {% else %} From 90ee5df4132c32c313718eacada7a374da299939 Mon Sep 17 00:00:00 2001 From: elementyang Date: Sat, 29 Dec 2018 14:31:47 +0800 Subject: [PATCH 2/2] fix registry_storage_class equals empty string --- roles/kubernetes-apps/registry/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/kubernetes-apps/registry/tasks/main.yml b/roles/kubernetes-apps/registry/tasks/main.yml index fd8cb82e3..05f8f4703 100644 --- a/roles/kubernetes-apps/registry/tasks/main.yml +++ b/roles/kubernetes-apps/registry/tasks/main.yml @@ -59,8 +59,8 @@ - { name: registry-pvc, file: registry-pvc.yml, type: pvc } register: registry_manifests when: - - registry_storage_class != none - - registry_disk_size != none + - registry_storage_class != none and registry_storage_class != "" + - registry_disk_size != none and registry_disk_size != "" - inventory_hostname == groups['kube-master'][0] - name: Registry | Apply PVC manifests @@ -73,6 +73,6 @@ state: "latest" with_items: "{{ registry_manifests.results }}" when: - - registry_storage_class != none - - registry_disk_size != none + - registry_storage_class != none and registry_storage_class != "" + - registry_disk_size != none and registry_disk_size != "" - inventory_hostname == groups['kube-master'][0]