Merge remote-tracking branch 'origin/master' into HEAD

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.0
+CURRENT_RELEASE=0.10.0
 
 # OS detection
 ifeq ($(OS),Windows_NT)
@@ -66,11 +66,10 @@ endif
 endif
 
 
-.PHONY: build deploy deploy-olm build-image build-registry-image push-image push-registry-image push-manifest int-test-install int-test-collections int-test-uninstall int-test-lifecycle
+.PHONY: build deploy deploy-olm build-image build-registry-image push-image push-registry-image push-manifest int-test-install int-test-stacks int-test-uninstall int-test-lifecycle
 
 build: generate
 	GO111MODULE=on go install ./cmd/manager
-	GO111MODULE=on go install ./cmd/manager/collection
 	GO111MODULE=on go install ./cmd/manager/stack
 	GO111MODULE=on go install ./cmd/admission-webhook
 	GO111MODULE=on go install ./cmd/serving
@@ -81,7 +80,6 @@ build-image: generate
   # commands separately here.
   # operator-sdk build ${IMAGE}
 	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -o build/_output/bin/kabanero-operator -gcflags "all=-trimpath=$(GOPATH)" -asmflags "all=-trimpath=$(GOPATH)" -ldflags "-X main.GitTag=$(TRAVIS_TAG) -X main.GitCommit=$(TRAVIS_COMMIT) -X main.GitRepoSlug=$(TRAVIS_REPO_SLUG) -X main.BuildDate=`date -u +%Y%m%d.%H%M%S`" github.com/kabanero-io/kabanero-operator/cmd/manager
-	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -o build/_output/bin/kabanero-operator-collection-controller -gcflags "all=-trimpath=$(GOPATH)" -asmflags "all=-trimpath=$(GOPATH)" -ldflags "-X main.GitTag=$(TRAVIS_TAG) -X main.GitCommit=$(TRAVIS_COMMIT) -X main.GitRepoSlug=$(TRAVIS_REPO_SLUG) -X main.BuildDate=`date -u +%Y%m%d.%H%M%S`" github.com/kabanero-io/kabanero-operator/cmd/manager/collection
 	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -o build/_output/bin/kabanero-operator-stack-controller -gcflags "all=-trimpath=$(GOPATH)" -asmflags "all=-trimpath=$(GOPATH)" -ldflags "-X main.GitTag=$(TRAVIS_TAG) -X main.GitCommit=$(TRAVIS_COMMIT) -X main.GitRepoSlug=$(TRAVIS_REPO_SLUG) -X main.BuildDate=`date -u +%Y%m%d.%H%M%S`" github.com/kabanero-io/kabanero-operator/cmd/manager/stack
 	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -o build/_output/bin/admission-webhook -gcflags "all=-trimpath=$(GOPATH)" -asmflags "all=-trimpath=$(GOPATH)" -ldflags "-X main.GitTag=$(TRAVIS_TAG) -X main.GitCommit=$(TRAVIS_COMMIT) -X main.GitRepoSlug=$(TRAVIS_REPO_SLUG) -X main.BuildDate=`date -u +%Y%m%d.%H%M%S`" github.com/kabanero-io/kabanero-operator/cmd/admission-webhook
 	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -o build/_output/bin/serving -gcflags "all=-trimpath=$(GOPATH)" -asmflags "all=-trimpath=$(GOPATH)" -ldflags "-X main.GitTag=$(TRAVIS_TAG) -X main.GitCommit=$(TRAVIS_COMMIT) -X main.GitRepoSlug=$(TRAVIS_REPO_SLUG) -X main.BuildDate=`date -u +%Y%m%d.%H%M%S`" github.com/kabanero-io/kabanero-operator/cmd/serving
@@ -90,11 +88,12 @@ build-image: generate
 
 build-registry-image:
   # Build an OLM private registry for Kabanero. Should be run after push-image so the IMAGE SHA is generated
+	rm -Rf build/registry
 	mkdir -p build/registry
 	cp LICENSE build/registry/LICENSE
 	cp -R registry/manifests build/registry/
 	cp registry/Dockerfile build/registry/Dockerfile
-	cp deploy/crds/kabanero.io_kabaneros_crd.yaml deploy/crds/kabanero.io_collections_crd.yaml deploy/crds/kabanero.io_stacks_crd.yaml build/registry/manifests/kabanero-operator/$(CURRENT_RELEASE)/
+	cp deploy/crds/kabanero.io_kabaneros_crd.yaml deploy/crds/kabanero.io_stacks_crd.yaml build/registry/manifests/kabanero-operator/$(CURRENT_RELEASE)/
 
 # Use the internal service address in the CSV
 ifdef INTERNAL_REGISTRY
@@ -158,7 +157,6 @@ generate:
 install:
 	kubectl config set-context $$(kubectl config current-context) --namespace=kabanero
 	kubectl apply -f deploy/crds/kabanero.io_kabaneros_crd.yaml
-	kubectl apply -f deploy/crds/kabanero.io_collections_crd.yaml
 	kubectl apply -f deploy/crds/kabanero.io_stacks_crd.yaml
 
 deploy: 
@@ -199,7 +197,7 @@ ifndef GITHUB_TOKEN
 endif
 	mkdir -p build/bin
 	curl -L https://github.com/mitchellh/golicense/releases/download/v0.2.0/golicense_0.2.0_$(detected_OS)_x86_64.tar.gz | tar -C build/bin -xzf - golicense
-	build/bin/golicense -plain ./license-rules.json build/_output/bin/admission-webhook build/_output/bin/kabanero-operator build/_output/bin/kabanero-operator-collection-controller build/_output/bin/kabanero-operator-stack-controller build/_output/bin/serving | sort > 3RD_PARTY || true
+	build/bin/golicense -plain ./license-rules.json build/_output/bin/admission-webhook build/_output/bin/kabanero-operator build/_output/bin/kabanero-operator-stack-controller build/_output/bin/serving | sort > 3RD_PARTY || true
 	rm build/bin/golicense
 
 # Integration Tests

README.md

@@ -7,7 +7,7 @@ We suggest you install from a [release](https://github.com/kabanero-io/kabanero-
 [![Build Status](https://travis-ci.org/kabanero-io/kabanero-operator.svg?branch=master)](https://travis-ci.org/kabanero-io/kabanero-operator)
 
 The Kabanero operator is developed using:
-* `operator-sdk` version 0.16.0.
+* `operator-sdk` version 0.17.1.
 * `go` version 1.13.x
 
 ## Clone the Kabanero operator
@@ -17,7 +17,7 @@ git clone https://github.com/kabanero-io/kabanero-operator
 cd kabanero-operator
 ```
 
-# Quickstart - OpenShift Container Platform (OCP) 4.3
+# Quickstart - OpenShift Container Platform (OCP) 4.4
 
 We recommend you follow the install instructions referenced above to set up your cluster for the first time.  If you would rather set it up manually, please continue with the following steps:
 
@@ -31,7 +31,7 @@ oc login -u admin -p admin https://openshift.my.com:8443/
 ## Deploy Prerequisite operators:
 
 The following operators need to be installed at the cluster scope:
-* [OpenShift Serverless Operator](https://docs.openshift.com/container-platform/4.3/serverless/installing-openshift-serverless.html)
+* [OpenShift Serverless Operator](https://docs.openshift.com/container-platform/4.4/serverless/installing-openshift-serverless.html)
 * OpenShift Pipelines Operator (from community-operators)
 * Appsody Operator (from certified-operators)
 * Open Liberty Operator (from certified-operators)

build/Dockerfile

@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi7/ubi-minimal:latest
 LABEL vendor="Kabanero" \
       name="Kabanero Operator" \
       summary="Image for Kabanero Operator" \
-      description="This image contains the controller for the Kabanero Foundation and Collection.  See https://github.com/kabanero-io/kabanero-operator/"
+      description="This image contains the controller for the Kabanero Foundation.  See https://github.com/kabanero-io/kabanero-operator/"
 
 # The license must be here for Redhat container certification
 COPY LICENSE /licenses/
@@ -16,7 +16,6 @@ ENV OPERATOR=/usr/local/bin/kabanero-operator \
 # install operator binary and supporting controllers.
 COPY build/_output/bin/kabanero-operator ${OPERATOR}
 COPY build/_output/bin/kabanero-operator-stack-controller /usr/local/bin/kabanero-operator-stack-controller
-COPY build/_output/bin/kabanero-operator-collection-controller /usr/local/bin/kabanero-operator-collection-controller
 COPY build/_output/bin/admission-webhook /usr/local/bin/admission-webhook
 COPY build/_output/bin/serving /usr/local/bin/serving
 

cmd/admission-webhook/main.go

@@ -9,8 +9,6 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"github.com/kabanero-io/kabanero-operator/pkg/apis"
-	collectionwebhook "github.com/kabanero-io/kabanero-operator/pkg/webhook/collection"
-	kabanerowebhookv1alpha1 "github.com/kabanero-io/kabanero-operator/pkg/webhook/kabanero/v1alpha1"
 	kabanerowebhookv1alpha2 "github.com/kabanero-io/kabanero-operator/pkg/webhook/kabanero/v1alpha2"
 	stackwebhook "github.com/kabanero-io/kabanero-operator/pkg/webhook/stack"
 
@@ -98,10 +96,6 @@ func main() {
 	// Setup the webhook server
 	hookServer := mgr.GetWebhookServer()
 	hookServer.Port = 9443
-	hookServer.Register("/validate-collections", collectionwebhook.BuildValidatingWebhook(&mgr))
-	hookServer.Register("/mutate-collections", collectionwebhook.BuildMutatingWebhook(&mgr))
-	hookServer.Register("/validate-kabaneros", kabanerowebhookv1alpha1.BuildValidatingWebhook(&mgr))
-	hookServer.Register("/mutate-kabaneros", kabanerowebhookv1alpha1.BuildMutatingWebhook(&mgr))
 	hookServer.Register("/validate-kabaneros/v1alpha2", kabanerowebhookv1alpha2.BuildValidatingWebhook(&mgr))
 	hookServer.Register("/validate-stacks", stackwebhook.BuildValidatingWebhook(&mgr))
 	hookServer.Register("/mutate-stacks", stackwebhook.BuildMutatingWebhook(&mgr))

config/samples/default.yaml

@@ -3,14 +3,14 @@ kind: Kabanero
 metadata:
   name: kabanero
 spec:
-  version: "0.9.0"
+  version: "0.10.0"
   stacks:
     repositories:
     - name: central
       https:
         url: https://github.com/kabanero-io/kabanero-stack-hub/releases/download/0.9.0/kabanero-stack-hub-index.yaml
     pipelines:
     - id: default
-      sha256: 63b98242b60f6a1cf240b430d24659b9727d16013935553a798be1e6c122c479
+      sha256: deb5162495e1fe60ab52632f0879f9c9b95e943066590574865138791cbe948f
       https:
-        url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.0/default-kabanero-pipelines.tar.gz
+        url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.1/default-kabanero-pipelines.tar.gz

config/samples/full.yaml

@@ -9,42 +9,31 @@ metadata:
 spec:
   # The platform version determines the desired version for all components, but those
   # can be overriden individually as well
-  version: "0.9.0"
+  version: "0.10.0"
 
   targetNamespaces:
   - kabanero
 
   cliServices:
     # Overrides the setting for version on this component
-    version: "0.9.0"
+    version: "0.10.0"
 
     # Overrides the image as a separate repository or tag
     repository: kabanero/kabanero-command-line-services
-    tag: "0.9.0"
+    tag: "0.9.1"
 
     # Overrides the image uri
-    image: kabanero/kabanero-command-line-services:0.9.0
+    image: kabanero/kabanero-command-line-services:0.9.1
 
     # Indicates the token expiration time 
     # Specify a positive integer followed by a unit of time, which can be hours (h), minutes (m), or seconds (s). 
     # For example, specify 30 seconds as 30s. 
     # You can include multiple values in a single entry. For example, 1m30s is equivalent to 90 seconds.
     sessionExpirationSeconds: "1440m"
 
-  collectionController:
-    # Overrides the setting for version on this component
-    version: "0.9.0"
-
-    # Overrides the image as a separate repository or tag
-    repository: kabanero/kabanero-operator
-    tag: "TRAVIS_TAG"
-
-    # Overrides the image uri
-    image: kabanero/kabanero-operator:TRAVIS_TAG
-
   stackController:
     # Overrides the setting for version on this component
-    version: "0.9.0"
+    version: "0.10.0"
 
     # Overrides the image as a separate repository or tag
     repository: kabanero/kabanero-operator
@@ -58,7 +47,7 @@ spec:
     enable: true
 
     # Overrides the setting for version on this component
-    version: "0.9.0"
+    version: "0.10.0"
 
     # Overrides the image as a separate repository or tag
     repository: kabanero/landing
@@ -69,7 +58,7 @@ spec:
 
   admissionControllerWebhook:
     # Overrides the setting for version on this component
-    version: "0.9.0"
+    version: "0.10.0"
 
     # Overrides the image as a separate repository or tag
     repository: kabanero/kabanero-operator
@@ -99,7 +88,7 @@ spec:
         # Image used in Devfile registry deployment.
         devFileRegistryImage:
           # Overrides the setting for version on this component.
-          version: "0.9.0"
+          version: "0.10.0"
 
           # Overrides the image as a separate repository or tag
           repository: kabanero/che-devfile-registry
@@ -131,16 +120,16 @@ spec:
         url: https://github.com/kabanero-io/kabanero-stack-hub/releases/download/0.9.0/kabanero-stack-hub-index.yaml
     pipelines:
     - id: default
-      sha256: 63b98242b60f6a1cf240b430d24659b9727d16013935553a798be1e6c122c479
+      sha256: deb5162495e1fe60ab52632f0879f9c9b95e943066590574865138791cbe948f
       https:
-        url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.0/default-kabanero-pipelines.tar.gz
+        url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.1/default-kabanero-pipelines.tar.gz
 
   gitops:
     pipelines:
     - id: gitops
-      sha256: 683e8a05482a166ad4d76b6358227d3807a66e7edd8bc80483d6a88bca6c4095
+      sha256: 7996bf29f338f8154e9c7db977833bf33d0a6d4e228109fab411d3b38ed4b99e
       https:
-        url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.0/kabanero-gitops-pipelines.tar.gz
+        url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.1/kabanero-gitops-pipelines.tar.gz
 
   governancePolicy:
     # Provide governance configuration for all stacks managed by Kabanero. The allowed configuration policies are:
@@ -172,7 +161,7 @@ spec:
 
     # Overrides the version of the events operator, as defined in
     # config/versions.yaml
-    version: "0.9.0"
+    version: "0.10.0"
 
     # Overrides the events-operator image as a separate repository or tag
     repository: kabanero/events-operator