Browse Source

Merge pull request #1914 from jkroepke/patch-1

Task "Update router image to current version" failed, if router not in default namespace
Jason DeTiberus 9 years ago
parent
commit
c78e91c7d4
1 changed files with 2 additions and 2 deletions
  1. 2 2
      playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml

+ 2 - 2
playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml

@@ -37,7 +37,7 @@
   - name: Update router image to current version
     when: all_routers.rc == 0
     command: >
-      {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -p
+      {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -n {{ item['namespace'] }} -p
       '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}","livenessProbe":{"tcpSocket":null,"httpGet":{"path": "/healthz", "port": 1936, "host": "localhost", "scheme": "HTTP"},"initialDelaySeconds":10,"timeoutSeconds":1}}]}}}}'
       --api-version=v1
     with_items: haproxy_routers
@@ -52,7 +52,7 @@
   - name: Update registry image to current version
     when: _default_registry.rc == 0
     command: >
-      {{ oc_cmd }} patch dc/docker-registry -p
+      {{ oc_cmd }} patch dc/docker-registry -p -n default
       '{"spec":{"template":{"spec":{"containers":[{"name":"registry","image":"{{ registry_image }}"}]}}}}'
       --api-version=v1