Merge pull request #238 from philbrookes/fix-channel-name

fix channel name

Author: philbrookes

Makefile

@@ -5,8 +5,8 @@ NAMESPACE=integreatly
 PROJECT=integreatly-operator
 REG=quay.io
 SHELL=/bin/bash
-PREVIOUS_TAG=1.12.0
-TAG=1.13.0
+PREVIOUS_TAG=1.13.0
+TAG=1.13.1
 PKG=github.com/integr8ly/integreatly-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=integreatly-operator-test
@@ -207,8 +207,8 @@ deploy/integreatly-installation-cr.yml:
 gen/csv:
 	@mv deploy/olm-catalog/integreatly-operator/integreatly-operator-$(PREVIOUS_TAG) deploy/olm-catalog/integreatly-operator/$(PREVIOUS_TAG)
 	@rm -rf deploy/olm-catalog/integreatly-operator/integreatly-operator-$(TAG)
-	sed -i 's/image:.*/image: quay\.io\/integreatly\/integreatly-operator:v$(TAG)/g' deploy/operator.yaml
-	operator-sdk olm-catalog gen-csv --csv-version $(TAG) --update-crds --from-version $(PREVIOUS_TAG)
+	@sed -i 's/image:.*/image: quay\.io\/integreatly\/integreatly-operator:v$(TAG)/g' deploy/operator.yaml
+	operator-sdk olm-catalog gen-csv --csv-version $(TAG) --default-channel --csv-channel=integreatly --update-crds --from-version $(PREVIOUS_TAG)
 	@echo Updating package file
 	@sed -i 's/$(PREVIOUS_TAG)/$(TAG)/g' version/version.go
 	@sed -i 's/$(PREVIOUS_TAG)/$(TAG)/g' deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml

deploy/olm-catalog/integreatly-operator/integreatly-operator-1.13.1/integreatly-operator.v1.13.1.clusterserviceversion.yaml

@@ -0,0 +1,83 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: installations.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: Installation
+    listKind: InstallationList
+    plural: installations
+    singular: installation
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: Installation is the Schema for the installations API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: InstallationSpec defines the desired state of Installation
+          properties:
+            masterURL:
+              type: string
+            namespacePrefix:
+              type: string
+            pullSecret:
+              properties:
+                name:
+                  type: string
+                namespace:
+                  type: string
+              required:
+              - name
+              - namespace
+              type: object
+            routingSubdomain:
+              type: string
+            selfSignedCerts:
+              type: boolean
+            type:
+              description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+                Important: Run "operator-sdk generate k8s" to regenerate code after
+                modifying this file Add custom validation using kubebuilder tags:
+                https://book.kubebuilder.io/beyond_basics/generating_crd.html'
+              type: string
+          required:
+          - namespacePrefix
+          - selfSignedCerts
+          - type
+          type: object
+        status:
+          description: InstallationStatus defines the observed state of Installation
+          properties:
+            preflightMessage:
+              type: string
+            preflightStatus:
+              type: string
+            stages:
+              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
+                of cluster Important: Run "operator-sdk generate k8s" to regenerate
+                code after modifying this file Add custom validation using kubebuilder
+                tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html'
+          required:
+          - stages
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true

deploy/olm-catalog/integreatly-operator/integreatly-operator-1.13.1/integreatly.org_installations_crd.yaml

@@ -1,5 +1,5 @@
 channels:
-- currentCSV: integreatly-operator.v1.13.0
-  name: alpha
-defaultChannel: alpha
-packageName: integreatly-operator
+- currentCSV: integreatly-operator.v1.13.1
+  name: integreatly
+defaultChannel: integreatly
+packageName: integreatly

deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml

@@ -17,7 +17,7 @@ objects:
       name: ${SUBSCRIPTION_NAME}
       namespace: ${NAMESPACE}
     spec:
-      channel: integreatly
+      channel: ${CHANNEL}
       installPlanApproval: Automatic
       name: integreatly
       source: ${CATALOG_SOURCE_CONFIG_NAME}
@@ -44,3 +44,7 @@ parameters:
     displayName: Subscription Name
     name: SUBSCRIPTION_NAME
     value: integreatly-operator
+   - description: The name of the channel
+     displayName: Channel Name
+     name: CHANNEL
+     value: integreatly

deploy/operator-subscription-template.yml

@@ -16,7 +16,7 @@ spec:
       containers:
         - name: integreatly-operator
           # Replace this with the built image name
-          image: quay.io/integreatly/integreatly-operator:v1.13.0
+          image: quay.io/integreatly/integreatly-operator:v1.13.1
           command:
           - integreatly-operator
           imagePullPolicy: Always

deploy/operator.yaml

@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "1.13.0"
+	Version = "1.13.1"
 )