From 51ffcb739c1ebf9872aa3f45a905b087ae9e0f48 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Tue, 25 Apr 2017 10:20:39 -0400
Subject: Standardize all Origin versioning on 3.6

---
 .../files/v1.6/enterprise/registry-console.yaml    | 124 ---------------------
 .../files/v1.6/origin/registry-console.yaml        | 124 ---------------------
 .../files/v3.6/enterprise/registry-console.yaml    | 124 +++++++++++++++++++++
 .../files/v3.6/origin/registry-console.yaml        | 124 +++++++++++++++++++++
 4 files changed, 248 insertions(+), 248 deletions(-)
 delete mode 100644 roles/openshift_hosted_templates/files/v1.6/enterprise/registry-console.yaml
 delete mode 100644 roles/openshift_hosted_templates/files/v1.6/origin/registry-console.yaml
 create mode 100644 roles/openshift_hosted_templates/files/v3.6/enterprise/registry-console.yaml
 create mode 100644 roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml

(limited to 'roles/openshift_hosted_templates')

diff --git a/roles/openshift_hosted_templates/files/v1.6/enterprise/registry-console.yaml b/roles/openshift_hosted_templates/files/v1.6/enterprise/registry-console.yaml
deleted file mode 100644
index 28feac4e6..000000000
--- a/roles/openshift_hosted_templates/files/v1.6/enterprise/registry-console.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-kind: Template
-apiVersion: v1
-metadata:
-  name: "registry-console"
-  annotations:
-    description: "Template for deploying registry web console. Requires cluster-admin."
-    tags: infrastructure
-labels:
-  createdBy: "registry-console-template"
-objects:
-  - kind: DeploymentConfig
-    apiVersion: v1
-    metadata:
-      name: "registry-console"
-      labels:
-        name: "registry-console"
-    spec:
-      triggers:
-      - type: ConfigChange
-      replicas: 1
-      selector:
-        name: "registry-console"
-      template:
-        metadata:
-          labels:
-            name: "registry-console"
-        spec:
-          containers:
-            - name: registry-console
-              image: ${IMAGE_PREFIX}registry-console:${IMAGE_VERSION}
-              ports:
-                - containerPort: 9090
-                  protocol: TCP
-              livenessProbe:
-                failureThreshold: 3
-                httpGet:
-                  path: /ping
-                  port: 9090
-                  scheme: HTTP
-                initialDelaySeconds: 10
-                periodSeconds: 10
-                successThreshold: 1
-                timeoutSeconds: 5
-              readinessProbe:
-                failureThreshold: 3
-                httpGet:
-                  path: /ping
-                  port: 9090
-                  scheme: HTTP
-                periodSeconds: 10
-                successThreshold: 1
-                timeoutSeconds: 5
-              env:
-                - name: OPENSHIFT_OAUTH_PROVIDER_URL
-                  value: "${OPENSHIFT_OAUTH_PROVIDER_URL}"
-                - name: OPENSHIFT_OAUTH_CLIENT_ID
-                  value: "${OPENSHIFT_OAUTH_CLIENT_ID}"
-                - name: KUBERNETES_INSECURE
-                  value: "false"
-                - name: COCKPIT_KUBE_INSECURE
-                  value: "false"
-                - name: REGISTRY_ONLY
-                  value: "true"
-                - name: REGISTRY_HOST
-                  value: "${REGISTRY_HOST}"
-  - kind: Service
-    apiVersion: v1
-    metadata:
-     name: "registry-console"
-     labels:
-       name: "registry-console"
-    spec:
-      type: ClusterIP
-      ports:
-        - name: registry-console
-          protocol: TCP
-          port: 9000
-          targetPort: 9090
-      selector:
-        name: "registry-console"
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: registry-console
-      annotations:
-        description: Atomic Registry console
-    spec:
-      tags:
-        - annotations: null
-          from:
-            kind: DockerImage
-            name: ${IMAGE_PREFIX}registry-console
-          name: ${IMAGE_VERSION}
-  - kind: OAuthClient
-    apiVersion: v1
-    metadata:
-      name: "${OPENSHIFT_OAUTH_CLIENT_ID}"
-      respondWithChallenges: false
-    secret: "${OPENSHIFT_OAUTH_CLIENT_SECRET}"
-    redirectURIs:
-      - "${COCKPIT_KUBE_URL}"
-parameters:
-  - description: 'Specify "registry/repository" prefix for container image; e.g. for "registry.access.redhat.com/openshift3/registry-console:latest", set prefix "registry.access.redhat.com/openshift3/"'
-    name: IMAGE_PREFIX
-    value: "registry.access.redhat.com/openshift3/"
-  - description: 'Specify image version; e.g. for "registry.access.redhat.com/openshift3/registry-console:3.5", set version "3.5"'
-    name: IMAGE_VERSION
-    value: "3.5"
-  - description: "The public URL for the Openshift OAuth Provider, e.g. https://openshift.example.com:8443"
-    name: OPENSHIFT_OAUTH_PROVIDER_URL
-    required: true
-  - description: "The registry console URL. This should be created beforehand using 'oc create route passthrough --service registry-console --port registry-console -n default', e.g. https://registry-console-default.example.com"
-    name: COCKPIT_KUBE_URL
-    required: true
-  - description: "Oauth client secret"
-    name: OPENSHIFT_OAUTH_CLIENT_SECRET
-    from: "user[a-zA-Z0-9]{64}"
-    generate: expression
-  - description: "Oauth client id"
-    name: OPENSHIFT_OAUTH_CLIENT_ID
-    value: "cockpit-oauth-client"
-  - description: "The integrated registry hostname exposed via route, e.g. registry.example.com"
-    name: REGISTRY_HOST
-    required: true
diff --git a/roles/openshift_hosted_templates/files/v1.6/origin/registry-console.yaml b/roles/openshift_hosted_templates/files/v1.6/origin/registry-console.yaml
deleted file mode 100644
index 80cc4233b..000000000
--- a/roles/openshift_hosted_templates/files/v1.6/origin/registry-console.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-kind: Template
-apiVersion: v1
-metadata:
-  name: "registry-console"
-  annotations:
-    description: "Template for deploying registry web console. Requires cluster-admin."
-    tags: infrastructure
-labels:
-  createdBy: "registry-console-template"
-objects:
-  - kind: DeploymentConfig
-    apiVersion: v1
-    metadata:
-      name: "registry-console"
-      labels:
-        name: "registry-console"
-    spec:
-      triggers:
-      - type: ConfigChange
-      replicas: 1
-      selector:
-        name: "registry-console"
-      template:
-        metadata:
-          labels:
-            name: "registry-console"
-        spec:
-          containers:
-            - name: registry-console
-              image: ${IMAGE_NAME}:${IMAGE_VERSION}
-              ports:
-                - containerPort: 9090
-                  protocol: TCP
-              livenessProbe:
-                failureThreshold: 3
-                httpGet:
-                  path: /ping
-                  port: 9090
-                  scheme: HTTP
-                initialDelaySeconds: 10
-                periodSeconds: 10
-                successThreshold: 1
-                timeoutSeconds: 5
-              readinessProbe:
-                failureThreshold: 3
-                httpGet:
-                  path: /ping
-                  port: 9090
-                  scheme: HTTP
-                periodSeconds: 10
-                successThreshold: 1
-                timeoutSeconds: 5
-              env:
-                - name: OPENSHIFT_OAUTH_PROVIDER_URL
-                  value: "${OPENSHIFT_OAUTH_PROVIDER_URL}"
-                - name: OPENSHIFT_OAUTH_CLIENT_ID
-                  value: "${OPENSHIFT_OAUTH_CLIENT_ID}"
-                - name: KUBERNETES_INSECURE
-                  value: "false"
-                - name: COCKPIT_KUBE_INSECURE
-                  value: "false"
-                - name: REGISTRY_ONLY
-                  value: "true"
-                - name: REGISTRY_HOST
-                  value: "${REGISTRY_HOST}"
-  - kind: Service
-    apiVersion: v1
-    metadata:
-     name: "registry-console"
-     labels:
-       name: "registry-console"
-    spec:
-      type: ClusterIP
-      ports:
-        - name: registry-console
-          protocol: TCP
-          port: 9000
-          targetPort: 9090
-      selector:
-        name: "registry-console"
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: registry-console
-      annotations:
-        description: Atomic Registry console
-    spec:
-      tags:
-        - annotations: null
-          from:
-            kind: DockerImage
-            name: ${IMAGE_NAME}
-          name: ${IMAGE_VERSION}
-  - kind: OAuthClient
-    apiVersion: v1
-    metadata:
-      name: "${OPENSHIFT_OAUTH_CLIENT_ID}"
-      respondWithChallenges: false
-    secret: "${OPENSHIFT_OAUTH_CLIENT_SECRET}"
-    redirectURIs:
-      - "${COCKPIT_KUBE_URL}"
-parameters:
-  - description: "Container image name"
-    name: IMAGE_NAME
-    value: "cockpit/kubernetes"
-  - description: 'Specify image version; e.g. for "cockpit/kubernetes:latest", set version "latest"'
-    name: IMAGE_VERSION
-    value: latest
-  - description: "The public URL for the Openshift OAuth Provider, e.g. https://openshift.example.com:8443"
-    name: OPENSHIFT_OAUTH_PROVIDER_URL
-    required: true
-  - description: "The registry console URL. This should be created beforehand using 'oc create route passthrough --service registry-console --port registry-console -n default', e.g. https://registry-console-default.example.com"
-    name: COCKPIT_KUBE_URL
-    required: true
-  - description: "Oauth client secret"
-    name: OPENSHIFT_OAUTH_CLIENT_SECRET
-    from: "user[a-zA-Z0-9]{64}"
-    generate: expression
-  - description: "Oauth client id"
-    name: OPENSHIFT_OAUTH_CLIENT_ID
-    value: "cockpit-oauth-client"
-  - description: "The integrated registry hostname exposed via route, e.g. registry.example.com"
-    name: REGISTRY_HOST
-    required: true
diff --git a/roles/openshift_hosted_templates/files/v3.6/enterprise/registry-console.yaml b/roles/openshift_hosted_templates/files/v3.6/enterprise/registry-console.yaml
new file mode 100644
index 000000000..28feac4e6
--- /dev/null
+++ b/roles/openshift_hosted_templates/files/v3.6/enterprise/registry-console.yaml
@@ -0,0 +1,124 @@
+kind: Template
+apiVersion: v1
+metadata:
+  name: "registry-console"
+  annotations:
+    description: "Template for deploying registry web console. Requires cluster-admin."
+    tags: infrastructure
+labels:
+  createdBy: "registry-console-template"
+objects:
+  - kind: DeploymentConfig
+    apiVersion: v1
+    metadata:
+      name: "registry-console"
+      labels:
+        name: "registry-console"
+    spec:
+      triggers:
+      - type: ConfigChange
+      replicas: 1
+      selector:
+        name: "registry-console"
+      template:
+        metadata:
+          labels:
+            name: "registry-console"
+        spec:
+          containers:
+            - name: registry-console
+              image: ${IMAGE_PREFIX}registry-console:${IMAGE_VERSION}
+              ports:
+                - containerPort: 9090
+                  protocol: TCP
+              livenessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /ping
+                  port: 9090
+                  scheme: HTTP
+                initialDelaySeconds: 10
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 5
+              readinessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /ping
+                  port: 9090
+                  scheme: HTTP
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 5
+              env:
+                - name: OPENSHIFT_OAUTH_PROVIDER_URL
+                  value: "${OPENSHIFT_OAUTH_PROVIDER_URL}"
+                - name: OPENSHIFT_OAUTH_CLIENT_ID
+                  value: "${OPENSHIFT_OAUTH_CLIENT_ID}"
+                - name: KUBERNETES_INSECURE
+                  value: "false"
+                - name: COCKPIT_KUBE_INSECURE
+                  value: "false"
+                - name: REGISTRY_ONLY
+                  value: "true"
+                - name: REGISTRY_HOST
+                  value: "${REGISTRY_HOST}"
+  - kind: Service
+    apiVersion: v1
+    metadata:
+     name: "registry-console"
+     labels:
+       name: "registry-console"
+    spec:
+      type: ClusterIP
+      ports:
+        - name: registry-console
+          protocol: TCP
+          port: 9000
+          targetPort: 9090
+      selector:
+        name: "registry-console"
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: registry-console
+      annotations:
+        description: Atomic Registry console
+    spec:
+      tags:
+        - annotations: null
+          from:
+            kind: DockerImage
+            name: ${IMAGE_PREFIX}registry-console
+          name: ${IMAGE_VERSION}
+  - kind: OAuthClient
+    apiVersion: v1
+    metadata:
+      name: "${OPENSHIFT_OAUTH_CLIENT_ID}"
+      respondWithChallenges: false
+    secret: "${OPENSHIFT_OAUTH_CLIENT_SECRET}"
+    redirectURIs:
+      - "${COCKPIT_KUBE_URL}"
+parameters:
+  - description: 'Specify "registry/repository" prefix for container image; e.g. for "registry.access.redhat.com/openshift3/registry-console:latest", set prefix "registry.access.redhat.com/openshift3/"'
+    name: IMAGE_PREFIX
+    value: "registry.access.redhat.com/openshift3/"
+  - description: 'Specify image version; e.g. for "registry.access.redhat.com/openshift3/registry-console:3.5", set version "3.5"'
+    name: IMAGE_VERSION
+    value: "3.5"
+  - description: "The public URL for the Openshift OAuth Provider, e.g. https://openshift.example.com:8443"
+    name: OPENSHIFT_OAUTH_PROVIDER_URL
+    required: true
+  - description: "The registry console URL. This should be created beforehand using 'oc create route passthrough --service registry-console --port registry-console -n default', e.g. https://registry-console-default.example.com"
+    name: COCKPIT_KUBE_URL
+    required: true
+  - description: "Oauth client secret"
+    name: OPENSHIFT_OAUTH_CLIENT_SECRET
+    from: "user[a-zA-Z0-9]{64}"
+    generate: expression
+  - description: "Oauth client id"
+    name: OPENSHIFT_OAUTH_CLIENT_ID
+    value: "cockpit-oauth-client"
+  - description: "The integrated registry hostname exposed via route, e.g. registry.example.com"
+    name: REGISTRY_HOST
+    required: true
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
new file mode 100644
index 000000000..80cc4233b
--- /dev/null
+++ b/roles/openshift_hosted_templates/files/v3.6/origin/registry-console.yaml
@@ -0,0 +1,124 @@
+kind: Template
+apiVersion: v1
+metadata:
+  name: "registry-console"
+  annotations:
+    description: "Template for deploying registry web console. Requires cluster-admin."
+    tags: infrastructure
+labels:
+  createdBy: "registry-console-template"
+objects:
+  - kind: DeploymentConfig
+    apiVersion: v1
+    metadata:
+      name: "registry-console"
+      labels:
+        name: "registry-console"
+    spec:
+      triggers:
+      - type: ConfigChange
+      replicas: 1
+      selector:
+        name: "registry-console"
+      template:
+        metadata:
+          labels:
+            name: "registry-console"
+        spec:
+          containers:
+            - name: registry-console
+              image: ${IMAGE_NAME}:${IMAGE_VERSION}
+              ports:
+                - containerPort: 9090
+                  protocol: TCP
+              livenessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /ping
+                  port: 9090
+                  scheme: HTTP
+                initialDelaySeconds: 10
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 5
+              readinessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /ping
+                  port: 9090
+                  scheme: HTTP
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 5
+              env:
+                - name: OPENSHIFT_OAUTH_PROVIDER_URL
+                  value: "${OPENSHIFT_OAUTH_PROVIDER_URL}"
+                - name: OPENSHIFT_OAUTH_CLIENT_ID
+                  value: "${OPENSHIFT_OAUTH_CLIENT_ID}"
+                - name: KUBERNETES_INSECURE
+                  value: "false"
+                - name: COCKPIT_KUBE_INSECURE
+                  value: "false"
+                - name: REGISTRY_ONLY
+                  value: "true"
+                - name: REGISTRY_HOST
+                  value: "${REGISTRY_HOST}"
+  - kind: Service
+    apiVersion: v1
+    metadata:
+     name: "registry-console"
+     labels:
+       name: "registry-console"
+    spec:
+      type: ClusterIP
+      ports:
+        - name: registry-console
+          protocol: TCP
+          port: 9000
+          targetPort: 9090
+      selector:
+        name: "registry-console"
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: registry-console
+      annotations:
+        description: Atomic Registry console
+    spec:
+      tags:
+        - annotations: null
+          from:
+            kind: DockerImage
+            name: ${IMAGE_NAME}
+          name: ${IMAGE_VERSION}
+  - kind: OAuthClient
+    apiVersion: v1
+    metadata:
+      name: "${OPENSHIFT_OAUTH_CLIENT_ID}"
+      respondWithChallenges: false
+    secret: "${OPENSHIFT_OAUTH_CLIENT_SECRET}"
+    redirectURIs:
+      - "${COCKPIT_KUBE_URL}"
+parameters:
+  - description: "Container image name"
+    name: IMAGE_NAME
+    value: "cockpit/kubernetes"
+  - description: 'Specify image version; e.g. for "cockpit/kubernetes:latest", set version "latest"'
+    name: IMAGE_VERSION
+    value: latest
+  - description: "The public URL for the Openshift OAuth Provider, e.g. https://openshift.example.com:8443"
+    name: OPENSHIFT_OAUTH_PROVIDER_URL
+    required: true
+  - description: "The registry console URL. This should be created beforehand using 'oc create route passthrough --service registry-console --port registry-console -n default', e.g. https://registry-console-default.example.com"
+    name: COCKPIT_KUBE_URL
+    required: true
+  - description: "Oauth client secret"
+    name: OPENSHIFT_OAUTH_CLIENT_SECRET
+    from: "user[a-zA-Z0-9]{64}"
+    generate: expression
+  - description: "Oauth client id"
+    name: OPENSHIFT_OAUTH_CLIENT_ID
+    value: "cockpit-oauth-client"
+  - description: "The integrated registry hostname exposed via route, e.g. registry.example.com"
+    name: REGISTRY_HOST
+    required: true
-- 
cgit v1.2.1