Add make targets,scripts & docs for bundle format

Add make targets for buinding bundle images and index images

Add development docs

Delte obsolete scripts and csv manifests

Signed-off-by: Nikhil Thomas <nikthoma@redhat.com>

Author: nikhil-thomas

Makefile

@@ -15,6 +15,7 @@ include ./make/test.mk
 include ./make/docker.mk
 include ./make/csv.mk
 include ./opo-makefile.mk
+include ./opo-makefile-new-bundle-format.mk
 
 BUILD_OUTPUT_DIR ?= ./out/
 BUILD_OUTPUT_FILE ?= operator

README.md

@@ -59,8 +59,8 @@ You must install these tools:
 1. [`git`](https://help.github.com/articles/set-up-git/): For source control
 1. [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/): For
    interacting with your kube cluster
-1. operator-sdk: https://github.com/operator-framework/operator-sdk
-1. minikube: https://kubernetes.io/docs/tasks/tools/install-minikube/
+1. [operator-sdk](https://github.com/operator-framework/operator-sdk)
+1. [opm](https://github.com/operator-framework/operator-registry/releases/tag/v1.13.7)
 
 ### Install Minikube
 
@@ -81,19 +81,7 @@ eval $(minikube docker-env -p mk-tekton)
 
 ### Development build
 
-1. Change directory to '${GOPATH}/src/github.com/openshift/tektoncd-pipeline-operator'
-```
-cd ${GOPATH}/src/github.com/openshift/tektoncd-pipeline-operator
-```
-2. Build go and the container image
-```
-make osdk-image IMAGE_TAG=${YOUR_REGISTRY}/openshift-pipelines-operator:${YOUR_IMAGE_TAG}
-```
-3. Push the container image
-```
-docker push ${YOUR_REGISTRY}/openshift-pipelines-operator:${YOUR_IMAGE_TAG}
-```
-4. Edit the 'image' value in deploy/operator.yaml to match to your image
+[Development Guide](docs/development.md)
 
 #### [Running tests](docs/tests.md)
 

bundle.Dockerfile

@@ -0,0 +1,11 @@
+FROM scratch
+
+LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
+LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
+LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
+LABEL operators.operatorframework.io.bundle.package.v1=openshift-pipelines-operator-midstr
+LABEL operators.operatorframework.io.bundle.channels.v1=canary
+LABEL operators.operatorframework.io.bundle.channel.default.v1=canary
+
+COPY bundle/manifests /manifests/
+COPY bundle/metadata /metadata/

…rator.v0.11.2.clusterserviceversion.yaml …ines-operator.clusterserviceversion.yamlolm-catalog/openshift-pipelines-operator/0.11.2/openshift-pipelines-operator.v0.11.2.clusterserviceversion.yaml renamed to bundle/manifests/openshift-pipelines-operator.clusterserviceversion.yaml olm-catalog/openshift-pipelines-operator/0.11.2/openshift-pipelines-operator.v0.11.2.clusterserviceversion.yaml renamed to bundle/manifests/openshift-pipelines-operator.clusterserviceversion.yaml

@@ -18,14 +18,14 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Developer Tools, Integration & Delivery
     certified: "false"
-    containerImage: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.11.2
+    containerImage: quay.io/openshift-pipeline/openshift-pipelines-operator-controller:v0.15.2-1
     createdAt: "2019-03-15T19:44:21Z"
     description: OpenShift Pipelines is a cloud-native CI/CD solution for building
       pipelines using Tekton concepts which run natively on OpenShift and Kubernetes.
     operators.operatorframework.io/internal-objects: '["config.operator.tekton.dev"]'
     repository: https://github.com/openshift/tektoncd-pipeline-operator
     support: Red Hat, Inc.
-  name: openshift-pipelines-operator.v0.11.2
+  name: openshift-pipelines-operator.v0.15.2-1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -370,13 +370,15 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
+                - name: IMAGE_ADDONS_PARAM_KN_IMAGE
+                  value: registry.redhat.io/openshift-serverless-1/client-kn-rhel8:0.13.2
                 - name: POD_NAME
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.name
                 - name: OPERATOR_NAME
                   value: openshift-pipelines-operator
-                image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.11.2
+                image: quay.io/openshift-pipeline/openshift-pipelines-operator-controller:v0.15.2-1
                 imagePullPolicy: Always
                 name: openshift-pipelines-operator
                 resources: {}
@@ -407,10 +409,4 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: openshift-pipelines-operator.v0.10.7
-  skips:
-  - openshift-pipelines-operator.v0.10.8
-  - openshift-pipelines-operator.v0.11.0-rc2
-  - openshift-pipelines-operator.v0.11.0
-  - openshift-pipelines-operator.v0.11.1
-  version: 0.11.2
+  version: 0.15.2-1

…0.11.2/operator_v1alpha1_config_crd.yaml …ifests/operator_v1alpha1_config_crd.yamlolm-catalog/openshift-pipelines-operator/0.11.2/operator_v1alpha1_config_crd.yaml renamed to bundle/manifests/operator_v1alpha1_config_crd.yaml olm-catalog/openshift-pipelines-operator/0.11.2/operator_v1alpha1_config_crd.yaml renamed to bundle/manifests/operator_v1alpha1_config_crd.yaml

@@ -42,11 +42,19 @@ spec:
                   details:
                     description: Additional details about the Code
                     type: string
+                  pipelineVersion:
+                    description: The version of OpenShift pipelines
+                    type: string
+                  triggersVersion:
+                    description: The version of OpenShift triggers
+                    type: string
                   version:
-                    description: The version of tekton pipelines
+                    description: The version of OpenShift pipelines operator
                     type: string
                 required:
                 - code
+                - pipelineVersion
+                - triggersVersion
                 - version
                 type: object
               type: array

bundle/metadata/annotations.yaml

@@ -0,0 +1,7 @@
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: canary
+  operators.operatorframework.io.bundle.channels.v1: canary
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: openshift-pipelines-operator-midstr

deploy/operator.yaml

@@ -16,7 +16,7 @@ spec:
       serviceAccountName: openshift-pipelines-operator
       containers:
       - name: openshift-pipelines-operator
-        image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.11.2
+        image: quay.io/openshift-pipeline/openshift-pipelines-operator-controller:v0.15.2-1
         command:
         - openshift-pipelines-operator
         - --recursive