Standardize all Origin versioning on 3.6

4 files changed, 0 insertions, 366 deletions

diff --git a/roles/openshift_storage_glusterfs/files/v1.6/deploy-heketi-template.yml b/roles/openshift_storage_glusterfs/files/v1.6/deploy-heketi-template.yml
deleted file mode 100644
index c9945be13..000000000
--- a/roles/openshift_storage_glusterfs/files/v1.6/deploy-heketi-template.yml
+++ /dev/null
@@ -1,115 +0,0 @@
----
-kind: Template
-apiVersion: v1
-metadata:
-  name: deploy-heketi
-  labels:
-    glusterfs: heketi-template
-    deploy-heketi: support
-  annotations:
-    description: Bootstrap Heketi installation
-    tags: glusterfs,heketi,installation
-labels:
-  template: deploy-heketi
-objects:
-- kind: Service
-  apiVersion: v1
-  metadata:
-    name: deploy-heketi
-    labels:
-      glusterfs: deploy-heketi-service
-      deploy-heketi: support
-    annotations:
-      description: Exposes Heketi service
-  spec:
-    ports:
-    - name: deploy-heketi
-      port: 8080
-      targetPort: 8080
-    selector:
-      name: deploy-heketi
-- kind: Route
-  apiVersion: v1
-  metadata:
-    name: deploy-heketi
-    labels:
-      glusterfs: deploy-heketi-route
-      deploy-heketi: support
-  spec:
-    to:
-      kind: Service
-      name: deploy-heketi
-- kind: DeploymentConfig
-  apiVersion: v1
-  metadata:
-    name: deploy-heketi
-    labels:
-      glusterfs: deploy-heketi-dc
-      deploy-heketi: support
-    annotations:
-      description: Defines how to deploy Heketi
-  spec:
-    replicas: 1
-    selector:
-      name: deploy-heketi
-    triggers:
-    - type: ConfigChange
-    strategy:
-      type: Recreate
-    template:
-      metadata:
-        name: deploy-heketi
-        labels:
-          name: deploy-heketi
-          glusterfs: deploy-heketi-pod
-          deploy-heketi: support
-      spec:
-        serviceAccountName: heketi-service-account
-        containers:
-        - name: deploy-heketi
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
-          env:
-          - name: HEKETI_USER_KEY
-            value: ${HEKETI_USER_KEY}
-          - name: HEKETI_ADMIN_KEY
-            value: ${HEKETI_ADMIN_KEY}
-          - name: HEKETI_EXECUTOR
-            value: kubernetes
-          - name: HEKETI_FSTAB
-            value: /var/lib/heketi/fstab
-          - name: HEKETI_SNAPSHOT_LIMIT
-            value: '14'
-          - name: HEKETI_KUBE_GLUSTER_DAEMONSET
-            value: '1'
-          ports:
-          - containerPort: 8080
-          volumeMounts:
-          - name: db
-            mountPath: /var/lib/heketi
-          readinessProbe:
-            timeoutSeconds: 3
-            initialDelaySeconds: 3
-            httpGet:
-              path: /hello
-              port: 8080
-          livenessProbe:
-            timeoutSeconds: 3
-            initialDelaySeconds: 30
-            httpGet:
-              path: /hello
-              port: 8080
-        volumes:
-        - name: db
-parameters:
-- name: HEKETI_USER_KEY
-  displayName: Heketi User Secret
-  description: Set secret for those creating volumes as type _user_
-- name: HEKETI_ADMIN_KEY
-  displayName: Heketi Administrator Secret
-  description: Set secret for administration of the Heketi service as user _admin_
-- name: IMAGE_NAME
-  displayName: GlusterFS container name
-  required: True
-- name: IMAGE_VERSION
-  displayName: GlusterFS container versiona
-  required: True
diff --git a/roles/openshift_storage_glusterfs/files/v1.6/glusterfs-registry-service.yml b/roles/openshift_storage_glusterfs/files/v1.6/glusterfs-registry-service.yml
deleted file mode 100644
index 3f8d8f507..000000000
--- a/roles/openshift_storage_glusterfs/files/v1.6/glusterfs-registry-service.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: glusterfs-registry-endpoints
-spec:
-  ports:
-  - port: 1
-status:
-  loadBalancer: {}
diff --git a/roles/openshift_storage_glusterfs/files/v1.6/glusterfs-template.yml b/roles/openshift_storage_glusterfs/files/v1.6/glusterfs-template.yml
deleted file mode 100644
index c66705752..000000000
--- a/roles/openshift_storage_glusterfs/files/v1.6/glusterfs-template.yml
+++ /dev/null
@@ -1,128 +0,0 @@
----
-kind: Template
-apiVersion: v1
-metadata:
-  name: glusterfs
-  labels:
-    glusterfs: template
-  annotations:
-    description: GlusterFS DaemonSet template
-    tags: glusterfs
-objects:
-- kind: DaemonSet
-  apiVersion: extensions/v1beta1
-  metadata:
-    name: glusterfs
-    labels:
-      glusterfs: daemonset
-    annotations:
-      description: GlusterFS DaemonSet
-      tags: glusterfs
-  spec:
-    selector:
-      matchLabels:
-        glusterfs-node: pod
-    template:
-      metadata:
-        name: glusterfs
-        labels:
-          glusterfs-node: pod
-      spec:
-        nodeSelector:
-          storagenode: glusterfs
-        hostNetwork: true
-        containers:
-        - name: glusterfs
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
-          imagePullPolicy: IfNotPresent
-          volumeMounts:
-          - name: glusterfs-heketi
-            mountPath: "/var/lib/heketi"
-          - name: glusterfs-run
-            mountPath: "/run"
-          - name: glusterfs-lvm
-            mountPath: "/run/lvm"
-          - name: glusterfs-etc
-            mountPath: "/etc/glusterfs"
-          - name: glusterfs-logs
-            mountPath: "/var/log/glusterfs"
-          - name: glusterfs-config
-            mountPath: "/var/lib/glusterd"
-          - name: glusterfs-dev
-            mountPath: "/dev"
-          - name: glusterfs-misc
-            mountPath: "/var/lib/misc/glusterfsd"
-          - name: glusterfs-cgroup
-            mountPath: "/sys/fs/cgroup"
-            readOnly: true
-          - name: glusterfs-ssl
-            mountPath: "/etc/ssl"
-            readOnly: true
-          securityContext:
-            capabilities: {}
-            privileged: true
-          readinessProbe:
-            timeoutSeconds: 3
-            initialDelaySeconds: 100
-            exec:
-              command:
-              - "/bin/bash"
-              - "-c"
-              - systemctl status glusterd.service
-            periodSeconds: 10
-            successThreshold: 1
-            failureThreshold: 3
-          livenessProbe:
-            timeoutSeconds: 3
-            initialDelaySeconds: 100
-            exec:
-              command:
-              - "/bin/bash"
-              - "-c"
-              - systemctl status glusterd.service
-            periodSeconds: 10
-            successThreshold: 1
-            failureThreshold: 3
-          resources: {}
-          terminationMessagePath: "/dev/termination-log"
-        volumes:
-        - name: glusterfs-heketi
-          hostPath:
-            path: "/var/lib/heketi"
-        - name: glusterfs-run
-          emptyDir: {}
-        - name: glusterfs-lvm
-          hostPath:
-            path: "/run/lvm"
-        - name: glusterfs-etc
-          hostPath:
-            path: "/etc/glusterfs"
-        - name: glusterfs-logs
-          hostPath:
-            path: "/var/log/glusterfs"
-        - name: glusterfs-config
-          hostPath:
-            path: "/var/lib/glusterd"
-        - name: glusterfs-dev
-          hostPath:
-            path: "/dev"
-        - name: glusterfs-misc
-          hostPath:
-            path: "/var/lib/misc/glusterfsd"
-        - name: glusterfs-cgroup
-          hostPath:
-            path: "/sys/fs/cgroup"
-        - name: glusterfs-ssl
-          hostPath:
-            path: "/etc/ssl"
-        restartPolicy: Always
-        terminationGracePeriodSeconds: 30
-        dnsPolicy: ClusterFirst
-        securityContext: {}
-parameters:
-- name: IMAGE_NAME
-  displayName: GlusterFS container name
-  required: True
-- name: IMAGE_VERSION
-  displayName: GlusterFS container versiona
-  required: True
diff --git a/roles/openshift_storage_glusterfs/files/v1.6/heketi-template.yml b/roles/openshift_storage_glusterfs/files/v1.6/heketi-template.yml
deleted file mode 100644
index df045c170..000000000
--- a/roles/openshift_storage_glusterfs/files/v1.6/heketi-template.yml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-kind: Template
-apiVersion: v1
-metadata:
-  name: heketi
-  labels:
-    glusterfs: heketi-template
-  annotations:
-    description: Heketi service deployment template
-    tags: glusterfs,heketi
-labels:
-  template: heketi
-objects:
-- kind: Service
-  apiVersion: v1
-  metadata:
-    name: heketi
-    labels:
-      glusterfs: heketi-service
-    annotations:
-      description: Exposes Heketi service
-  spec:
-    ports:
-    - name: heketi
-      port: 8080
-      targetPort: 8080
-    selector:
-      glusterfs: heketi-pod
-- kind: Route
-  apiVersion: v1
-  metadata:
-    name: heketi
-    labels:
-      glusterfs: heketi-route
-  spec:
-    to:
-      kind: Service
-      name: heketi
-- kind: DeploymentConfig
-  apiVersion: v1
-  metadata:
-    name: heketi
-    labels:
-      glusterfs: heketi-dc
-    annotations:
-      description: Defines how to deploy Heketi
-  spec:
-    replicas: 1
-    selector:
-      glusterfs: heketi-pod
-    triggers:
-    - type: ConfigChange
-    strategy:
-      type: Recreate
-    template:
-      metadata:
-        name: heketi
-        labels:
-          glusterfs: heketi-pod
-      spec:
-        serviceAccountName: heketi-service-account
-        containers:
-        - name: heketi
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
-          imagePullPolicy: IfNotPresent
-          env:
-          - name: HEKETI_USER_KEY
-            value: ${HEKETI_USER_KEY}
-          - name: HEKETI_ADMIN_KEY
-            value: ${HEKETI_ADMIN_KEY}
-          - name: HEKETI_EXECUTOR
-            value: kubernetes
-          - name: HEKETI_FSTAB
-            value: /var/lib/heketi/fstab
-          - name: HEKETI_SNAPSHOT_LIMIT
-            value: '14'
-          - name: HEKETI_KUBE_GLUSTER_DAEMONSET
-            value: '1'
-          ports:
-          - containerPort: 8080
-          volumeMounts:
-          - name: db
-            mountPath: /var/lib/heketi
-          readinessProbe:
-            timeoutSeconds: 3
-            initialDelaySeconds: 3
-            httpGet:
-              path: /hello
-              port: 8080
-          livenessProbe:
-            timeoutSeconds: 3
-            initialDelaySeconds: 30
-            httpGet:
-              path: /hello
-              port: 8080
-        volumes:
-        - name: db
-          glusterfs:
-            endpoints: heketi-storage-endpoints
-            path: heketidbstorage
-parameters:
-- name: HEKETI_USER_KEY
-  displayName: Heketi User Secret
-  description: Set secret for those creating volumes as type _user_
-- name: HEKETI_ADMIN_KEY
-  displayName: Heketi Administrator Secret
-  description: Set secret for administration of the Heketi service as user _admin_
-- name: IMAGE_NAME
-  displayName: GlusterFS container name
-  required: True
-- name: IMAGE_VERSION
-  displayName: GlusterFS container versiona
-  required: True