Procházet zdrojové kódy

Don't secure registry or deploy registry console when infra replics == 0

Andrew Butcher před 8 roky
rodič
revize
65e896d320

+ 14 - 0
roles/cockpit-ui/tasks/main.yml

@@ -12,6 +12,15 @@
     cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ openshift_hosted_kubeconfig }}
   changed_when: False
 
+- name: Determine if docker-registry service exists
+  command: >
+    {{ openshift.common.client_binary }} get svc/docker-registry
+    --config={{ openshift_hosted_kubeconfig }}
+    -n default
+  register: check_docker_registry_exists
+  failed_when: false
+  changed_when: false
+
 - name: Create passthrough route for docker-registry
   command: >
     {{ openshift.common.client_binary }} create route passthrough
@@ -21,6 +30,7 @@
   register: create_docker_registry_route
   changed_when: "'already exists' not in create_docker_registry_route.stderr"
   failed_when: "'already exists' not in create_docker_registry_route.stderr and create_docker_registry_route.rc != 0"
+  when: check_docker_registry_exists.rc == 0
 
 - name: Create passthrough route for registry-console
   command: >
@@ -32,6 +42,7 @@
   register: create_registry_console_route
   changed_when: "'already exists' not in create_registry_console_route.stderr"
   failed_when: "'already exists' not in create_registry_console_route.stderr and create_registry_console_route.rc != 0"
+  when: check_docker_registry_exists.rc == 0
 
 - name: Retrieve docker-registry route
   command: >
@@ -41,6 +52,7 @@
     -n default
   register: docker_registry_route
   changed_when: false
+  when: check_docker_registry_exists.rc == 0
 
 - name: Retrieve cockpit kube url
   command: >
@@ -49,6 +61,7 @@
     -n default
   register: registry_console_cockpit_kube_url
   changed_when: false
+  when: check_docker_registry_exists.rc == 0
 
 - name: Deploy registry-console
   command: >
@@ -62,6 +75,7 @@
   register: deploy_registry_console
   changed_when: "'already exists' not in deploy_registry_console.stderr"
   failed_when: "'already exists' not in deploy_registry_console.stderr and deploy_registry_console.rc != 0"
+  when: check_docker_registry_exists.rc == 0
 
 - name: Delete temp directory
   file:

+ 1 - 0
roles/openshift_hosted/tasks/registry/registry.yml

@@ -53,6 +53,7 @@
 
 - include: secure.yml
   static: no
+  when: replicas | int > 0
 
 - include: storage/object_storage.yml
   static: no