Merge pull request #767 from dacleyra/origin/updatecodewind0141

updatecodewind0141

Makefile

@@ -53,7 +53,7 @@ IMAGE_SHA = $(lastword $(subst @, ,$(IMAGE_REPO_DIGEST)))
 REGISTRY_IMAGE_SHA = $(lastword $(subst @, ,$(REGISTRY_IMAGE_REPO_DIGEST)))
 
 # Current release (used for CSV management)
-CURRENT_RELEASE=0.9.1
+CURRENT_RELEASE=0.9.2
 
 # OS detection
 ifeq ($(OS),Windows_NT)

config/orchestrations/codeready-workspaces/0.1/codewind-rolebinding.yaml

@@ -0,0 +1,11 @@
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kabanero-codewind
+subjects:
+- kind: ServiceAccount
+  name: che-workspace
+roleRef:
+  kind: ClusterRole
+  name: kabanero-codewind
+  apiGroup: rbac.authorization.k8s.io

config/samples/default.yaml

@@ -3,7 +3,7 @@ kind: Kabanero
 metadata:
   name: kabanero
 spec:
-  version: "0.9.1"
+  version: "0.9.2"
   stacks:
     repositories:
     - name: central

config/samples/full.yaml

@@ -9,7 +9,7 @@ metadata:
 spec:
   # The platform version determines the desired version for all components, but those
   # can be overriden individually as well
-  version: "0.9.1"
+  version: "0.9.2"
 
   targetNamespaces:
   - kabanero
@@ -92,10 +92,10 @@ spec:
 
           # Overrides the image as a separate repository or tag
           repository: kabanero/che-devfile-registry
-          tag: "0.11.0"
+          tag: "0.14.1"
 
           # Overrides the image uri
-          image: kabanero/che-devfile-registry:0.11.0
+          image: kabanero/che-devfile-registry:0.14.1
 
         # Specifies a custom cluster role to user for the Che workspaces uses the default roles if left blank.
         # The default value is kabanero-codewind.

config/versions.yaml

@@ -13,6 +13,17 @@ default: "0.9.1"
 
 # Top level: relates Kabanero versions to software versions
 kabanero:
+- version: "0.9.2"
+  related-versions: 
+    cli-services: "0.9.1"
+    landing: "0.9.0"
+    events: "0.9.0"
+    collection-controller: "0.9.1"
+    stack-controller: "0.9.1"
+    admission-webhook: "0.9.1"
+    sso: "7.3.2"
+    codeready-workspaces: "0.9.2"
+
 - version: "0.9.1"
   related-versions: 
     cli-services: "0.9.1"
@@ -130,6 +141,11 @@ related-software:
       tag: "0.6.0"
 
   codeready-workspaces:
+  - version: "0.9.2"
+    orchestrations: "orchestrations/codeready-workspaces/0.1"
+    identifiers:
+      devfile-reg-repository: "kabanero/che-devfile-registry"
+      devfile-reg-tag: "0.14.1"
   - version: "0.9.0"
     orchestrations: "orchestrations/codeready-workspaces/0.1"
     identifiers:

pkg/controller/kabaneroplatform/codereadyworkspaces.go

@@ -34,6 +34,7 @@ var crwlog = rlog.Log.WithName("kabanero-codeready-workspaces")
 const (
 	crwOrchestrationFilePath         = "orchestrations/codeready-workspaces/0.1"
 	crwYamlNameCodewindClusterRole   = "codewind-clusterrole.yaml"
+	crwYamlNameCodewindRoleBinding   = "codewind-rolebinding.yaml"
 	crwYamlNameCodewindTektonRole    = "codewind-tekton-role.yaml"
 	crwYamlNameCodewindTektonBinding = "codewind-tekton-rolebinding.yaml"
 	crwOperatorCR                    = "codeready-workspaces-cr.yaml"
@@ -76,6 +77,13 @@ func reconcileCRW(ctx context.Context, k *kabanerov1alpha2.Kabanero, c client.Cl
 		return err
 	}
 
+	// Deploy the Codewind rolebinding
+	err = processCRWYaml(ctx, k, rev, templateCtx, c, crwYamlNameCodewindRoleBinding, true, k.GetNamespace())
+	if err != nil {
+		logger.Error(err, fmt.Sprintf("Failed to Apply rolebinding resource. Revision: %v. TemplateCtx: %v", rev, templateCtx))
+		return err
+	}	
+
 	// Deploy the Codewind Tekton role
 	err = processCRWYaml(ctx, k, rev, templateCtx, c, crwYamlNameCodewindTektonRole, true, "tekton-pipelines")
 	if err != nil {
@@ -485,6 +493,11 @@ func deleteCRWOperatorResources(ctx context.Context, k *kabanerov1alpha2.Kabaner
 			return err
 		}
 
+		err = processCRWYaml(ctx, k, rev, unstructured.Unstructured{}.Object, c, crwYamlNameCodewindRoleBinding, false, k.GetNamespace())
+		if err != nil {
+			return err
+		}
+
 		// Delete the Tekton role and rolebinding too
 		err = processCRWYaml(ctx, k, rev, unstructured.Unstructured{}.Object, c, crwYamlNameCodewindTektonRole, false, "tekton-pipelines")
 		if err != nil {

registry/manifests/kabanero-operator/kabanero-operator-package.yaml

@@ -15,6 +15,6 @@ channels:
 - name: release-0.8
   currentCSV: kabanero-operator.v0.8.0
 - name: release-0.9
-  currentCSV: kabanero-operator.v0.9.1
+  currentCSV: kabanero-operator.v0.9.2
 defaultChannel: release-0.9