diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-08 15:14:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 15:14:34 -0500 |
| commit | 52d2eb56e3198ed83c7c9a912aa22919e2180985 (patch) | |
| tree | 8fd448c42e7cbe412231b9c6407e1690ae82f47b /roles/openshift_hosted_templates | |
| parent | 4c80a74d3c8e0ed8a164cf805d88285e265be790 (diff) | |
| parent | 37812f0da8f72df9108bfdcd882439d3faeea79b (diff) | |
| download | openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.tar.gz openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.tar.bz2 openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.tar.xz openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.zip | |
Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310
reconcile registry-console and docker_image_availability
Diffstat (limited to 'roles/openshift_hosted_templates')
| -rw-r--r-- | roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_hosted_templates/files/v3.7/origin/registry-console.yaml | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml b/roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml index 6811ece28..a78146ca4 100644 --- a/roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml +++ b/roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml @@ -27,7 +27,7 @@ objects: spec: containers: - name: registry-console - image: ${IMAGE_NAME}:${IMAGE_VERSION} + image: ${IMAGE_PREFIX}kubernetes:${IMAGE_VERSION} ports: - containerPort: 9090 protocol: TCP @@ -89,7 +89,7 @@ objects: - annotations: null from: kind: DockerImage - name: ${IMAGE_NAME}:${IMAGE_VERSION} + name: ${IMAGE_PREFIX}kubernetes:${IMAGE_VERSION} name: ${IMAGE_VERSION} - kind: OAuthClient apiVersion: v1 @@ -100,9 +100,9 @@ objects: redirectURIs: - "${COCKPIT_KUBE_URL}" parameters: - - description: "Container image name" - name: IMAGE_NAME - value: "cockpit/kubernetes" + - description: 'Specify "registry/namespace" prefix for container image; e.g. for "registry.example.com/cockpit/kubernetes:latest", set prefix "registry.example.com/cockpit/"' + name: IMAGE_PREFIX + value: "cockpit/" - description: 'Specify image version; e.g. for "cockpit/kubernetes:latest", set version "latest"' name: IMAGE_VERSION value: latest diff --git a/roles/openshift_hosted_templates/files/v3.7/origin/registry-console.yaml b/roles/openshift_hosted_templates/files/v3.7/origin/registry-console.yaml index 6811ece28..a78146ca4 100644 --- a/roles/openshift_hosted_templates/files/v3.7/origin/registry-console.yaml +++ b/roles/openshift_hosted_templates/files/v3.7/origin/registry-console.yaml @@ -27,7 +27,7 @@ objects: spec: containers: - name: registry-console - image: ${IMAGE_NAME}:${IMAGE_VERSION} + image: ${IMAGE_PREFIX}kubernetes:${IMAGE_VERSION} ports: - containerPort: 9090 protocol: TCP @@ -89,7 +89,7 @@ objects: - annotations: null from: kind: DockerImage - name: ${IMAGE_NAME}:${IMAGE_VERSION} + name: ${IMAGE_PREFIX}kubernetes:${IMAGE_VERSION} name: ${IMAGE_VERSION} - kind: OAuthClient apiVersion: v1 @@ -100,9 +100,9 @@ objects: redirectURIs: - "${COCKPIT_KUBE_URL}" parameters: - - description: "Container image name" - name: IMAGE_NAME - value: "cockpit/kubernetes" + - description: 'Specify "registry/namespace" prefix for container image; e.g. for "registry.example.com/cockpit/kubernetes:latest", set prefix "registry.example.com/cockpit/"' + name: IMAGE_PREFIX + value: "cockpit/" - description: 'Specify image version; e.g. for "cockpit/kubernetes:latest", set version "latest"' name: IMAGE_VERSION value: latest |