Merge pull request #21 from bbrowning/maistra-tech-preview-8

Bump to Maistra 0.6.0

Author: jcrossley3

etc/scripts/installation-functions.sh

@@ -225,12 +225,10 @@ function install_istio {
 	  istio:
 	    authentication: false
 	    community: true
-	    version: 0.2.0
 	  kiali:
 	    username: admin
 	    password: admin
 	    prefix: kiali/
-	    version: v0.7.1
 	EOF
     timeout 900 '$CMD get pods -n istio-system && [[ $($CMD get pods -n istio-system | grep openshift-ansible-istio-installer | grep -c Completed) -eq 0 ]]'
 

maistra-operators.catalogsource.yaml

@@ -132,12 +132,125 @@ data:
             kind: Installation
             displayName: Maistra Installation
             description: CRD representing Maistra installation options
+    - apiVersion: operators.coreos.com/v1alpha1
+      kind: ClusterServiceVersion
+      metadata:
+        name: maistra.v0.6.0
+      spec:
+        displayName: Maistra
+        description: "Maistra, otherwise known as OpenShift Service Mesh, is Red Hat's version of Istio."
+        keywords: ['service mesh', 'istio']
+        maintainers:
+        - name: Red Hat
+          email: [email protected]
+        provider:
+          name: Red Hat
+        links:
+        - name: Documentation
+          url: https://maistra.io
+        installModes:
+        - supported: true
+          type: OwnNamespace
+        - supported: true
+          type: SingleNamespace
+        - supported: false
+          type: MultiNamespace
+        - supported: true
+          type: AllNamespaces
+        install:
+          strategy: deployment
+          spec:
+            permissions:
+            - serviceAccountName: istio-operator
+              rules:
+              - apiGroups:
+                - istio.openshift.com
+                resources:
+                - "*"
+                verbs:
+                - "*"
+              - apiGroups:
+                - ""
+                resources:
+                - pods
+                - services
+                - endpoints
+                - persistentvolumeclaims
+                - events
+                - configmaps
+                - secrets
+                - securitycontextconstraints
+                verbs:
+                - "*"
+              - apiGroups:
+                - apps
+                resources:
+                - deployments
+                - daemonsets
+                - replicasets
+                - statefulsets
+                verbs:
+                - "*"
+            clusterPermissions:
+            - serviceAccountName: istio-operator
+              rules:
+              - apiGroups:
+                - '*'
+                resources:
+                - '*'
+                verbs:
+                - '*'
+              - nonResourceURLs:
+                - '*'
+                verbs:
+                - '*'
+            deployments:
+            - name: istio-operator
+              spec:
+                replicas: 1
+                strategy:
+                  type: RollingUpdate
+                selector:
+                  matchLabels:
+                    app: istio-operator
+                template:
+                  metadata:
+                    labels:
+                      app: istio-operator
+                  spec:
+                    containers:
+                    - name: istio-operator
+                      image: maistra/istio-operator-centos7:0.6.0
+                      ports:
+                      - containerPort: 60000
+                        name: metrics
+                      command:
+                      - istio-operator
+                      imagePullPolicy: Always
+                      env:
+                      - name: WATCH_NAMESPACE
+                        valueFrom:
+                          fieldRef:
+                            fieldPath: metadata.namespace
+                      - name: OPERATOR_NAME
+                        value: "istio-operator"
+                    serviceAccountName: istio-operator
+        maturity: alpha
+        version: 0.6.0
+        apiservicedefinitions:
+        customresourcedefinitions:
+          owned:
+          - name: installations.istio.openshift.com
+            version: v1alpha1
+            kind: Installation
+            displayName: Maistra Installation
+            description: CRD representing Maistra installation options
 
   packages: |-
     - packageName: maistra
       channels:
       - name: alpha
-        currentCSV: maistra.v0.5.0
+        currentCSV: maistra.v0.6.0
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource