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

Merge pull request #3950 from elementyang/pr-registry

Browse source 
fix registry_storage_class equals empty string
This commit is contained in:
Chad Swenson 2019-01-14 15:45:09 -06:00 committed by GitHub
commit 4959bfc1b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/kubernetes-apps/registry/tasks/main.yml
View file

@ -59,8 +59,8 @@
- { name: registry-pvc, file: registry-pvc.yml, type: pvc } - { name: registry-pvc, file: registry-pvc.yml, type: pvc }
register: registry_manifests register: registry_manifests
when: when:
- registry_storage_class != none - registry_storage_class != none and registry_storage_class != ""
- registry_disk_size != none - registry_disk_size != none and registry_disk_size != ""
- inventory_hostname == groups['kube-master'][0] - inventory_hostname == groups['kube-master'][0]
- name: Registry | Apply PVC manifests - name: Registry | Apply PVC manifests
@ -73,6 +73,6 @@
state: "latest" state: "latest"
with_items: "{{ registry_manifests.results }}" with_items: "{{ registry_manifests.results }}"
when: when:
- registry_storage_class != none - registry_storage_class != none and registry_storage_class != ""
- registry_disk_size != none - registry_disk_size != none and registry_disk_size != ""
- inventory_hostname == groups['kube-master'][0] - inventory_hostname == groups['kube-master'][0]

2
roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
View file

@ -44,7 +44,7 @@ spec:
protocol: TCP protocol: TCP
volumes: volumes:
- name: registry-pvc - name: registry-pvc
{% if registry_storage_class != none %} {% if registry_storage_class != "" %}
persistentVolumeClaim: persistentVolumeClaim:
claimName: registry-pvc claimName: registry-pvc
{% else %} {% else %}