Browse Source
Merge pull request #3950 from elementyang/pr-registry
fix registry_storage_class equals empty string
pull/3984/head
Chad Swenson
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
5 deletions
-
roles/kubernetes-apps/registry/tasks/main.yml
-
roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
|
|
|
@ -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] |
|
|
|
@ -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 %} |
|
|
|
|
