Modify kustomization.yaml in config/<platform>

Add separate overlays for defalut usecases (development, github
release...) and
operatorhub bundle generation.
e
The reason for the change is that operatorhub bundle generation does not
need servicce_account.yaml in a separate file. The service account is
spcified in CSV file.

Signed-off-by: Nikhil Thomas <[email protected]>

Update sample operahub bundles

Generate sample bundles for Kubernetes and OpenShift

Signed-off-by: Nikhil Thomas <[email protected]>

Makefile

@@ -50,7 +50,7 @@ $(BIN)/golangci-lint: | $(BIN) ; $(info $(M) getting golangci-lint $(GOLANGCI_VE
 clean-cluster: | $(KO) $(KUSTOMIZE) clean-cr; $(info $(M) clean $(TARGET)…) @ ## Cleanup cluster
 	@ ## --load-restrictor LoadRestrictionsNone is needed in kustomize build as files which not in child tree of kustomize base are pulled
 	@ ## https://github.com/kubernetes-sigs/kustomize/issues/766
-	-$(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/$(TARGET) | $(KO) delete -f -
+	-$(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/$(TARGET)/overlays/default | $(KO) delete -f -
 	-kubectl delete ns tekton-pipelines --ignore-not-found
 	-kubectl delete \
 		-f $(KO_DATA_PATH)/ \
@@ -93,7 +93,7 @@ get-releases: |
 apply: | $(KO) $(KUSTOMIZE) get-releases ; $(info $(M) ko apply on $(TARGET)) @ ## Apply config to the current cluster
 	@ ## --load-restrictor LoadRestrictionsNone is needed in kustomize build as files which not in child tree of kustomize base are pulled
 	@ ## https://github.com/kubernetes-sigs/kustomize/issues/766
-	$Q $(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/$(TARGET) | $(KO) apply $(PLATFORM) -f -
+	$Q $(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/$(TARGET)/overlays/default | $(KO) apply $(PLATFORM) -f -
 
 .PHONY: apply-cr
 apply-cr: | ; $(info $(M) apply CRs on $(TARGET)) @ ## Apply the CRs to the current cluster

config/kubernetes/kustomization.yaml → config/kubernetes/base/kustomization.yaml

@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-namespace: tekton-operator
-
 patches:
 - path: operator.yaml
   target:
@@ -31,8 +29,7 @@ configMapGenerator:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../base/
+- ../../base/
 - 300-operator_v1alpha1_dashboard_crd.yaml
 - 300-operator_v1alpha1_result_crd.yaml
-- service_account.yaml
 - operator_service.yaml

config/kubernetes/overlays/default/kustomization.yaml

@@ -0,0 +1,4 @@
+namespace: tekton-operator
+resources:
+- ../../base/
+- service_account.yaml

config/kubernetes/overlays/operatorhub/kustomization.yaml

@@ -0,0 +1,3 @@
+namespace: tekton-operator
+resources:
+- ../../base/

config/openshift/kustomization.yaml → config/openshift/base/kustomization.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-namespace: openshift-operators
 patches:
 - target:
     kind: Deployment
@@ -43,9 +42,8 @@ patchesStrategicMerge:
 - 100-namespace.yaml
 
 resources:
-- ../base/
+- ../../base/
 - 300-operator_v1alpha1_addon_crd.yaml
-- service_account.yaml
 - operator_service.yaml
 - operator_servicemonitor.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1

config/openshift/overlays/default/kustomization.yaml

@@ -0,0 +1,4 @@
+namespace: openshift-operators
+resources:
+- ../../base/
+- service_account.yaml

config/openshift/overlays/operatorhub/kustomization.yaml

@@ -0,0 +1,3 @@
+namespace: openshift-operators
+resources:
+- ../../base/

operatorhub/kubernetes/manifests/fetch-strategy-local/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
-- ../../../../config/kubernetes
+- ../../../../config/kubernetes/overlays/operatorhub
 - ../../../../config/crs/kubernetes
 - ../bases/tektoncd-operator.clusterserviceversion.template.yaml
 - ../../scorecard

operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonconfigs.yaml

@@ -3,8 +3,8 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
-    operator.tekton.dev/release: devel
-    version: v0.49.0
+    operator.tekton.dev/release: v0.50.0
+    version: v0.50.0
   name: tektonconfigs.operator.tekton.dev
 spec:
   group: operator.tekton.dev

operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektondashboards.yaml

@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     operator.tekton.dev/release: devel
-    version: v0.49.0
+    version: devel
   name: tektondashboards.operator.tekton.dev
 spec:
   group: operator.tekton.dev

operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektoninstallersets.yaml

@@ -0,0 +1,40 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  labels:
+    operator.tekton.dev/release: v0.50.0
+    version: v0.50.0
+  name: tektoninstallersets.operator.tekton.dev
+spec:
+  group: operator.tekton.dev
+  names:
+    kind: TektonInstallerSet
+    listKind: TektonInstallerSetList
+    plural: tektoninstallersets
+    singular: tektoninstallerset
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+      name: Reason
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Schema for the tektoninstallerset API
+        type: object
+        x-kubernetes-preserve-unknown-fields: true
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null

operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonpipelines.yaml

@@ -3,8 +3,8 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
-    operator.tekton.dev/release: devel
-    version: v0.49.0
+    operator.tekton.dev/release: v0.50.0
+    version: v0.50.0
   name: tektonpipelines.operator.tekton.dev
 spec:
   group: operator.tekton.dev

operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonresults.yaml

@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     operator.tekton.dev/release: devel
-    version: v0.49.0
+    version: devel
   name: tektonresults.operator.tekton.dev
 spec:
   group: operator.tekton.dev

operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektontriggers.yaml

@@ -3,8 +3,8 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
-    operator.tekton.dev/release: devel
-    version: v0.49.0
+    operator.tekton.dev/release: v0.50.0
+    version: v0.50.0
   name: tektontriggers.operator.tekton.dev
 spec:
   group: operator.tekton.dev

operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-config-observability_v1_configmap.yaml

@@ -0,0 +1,36 @@
+apiVersion: v1
+data:
+  _example: |
+    ################################
+    #                              #
+    #    EXAMPLE CONFIGURATION     #
+    #                              #
+    ################################
+    # This block is not actually functional configuration,
+    # but serves to illustrate the available configuration
+    # options and document them in a way that is accessible
+    # to users that `kubectl edit` this config map.
+    #
+    # These sample configuration options may be copied out of
+    # this example block and unindented to be in the data block
+    # to actually change the configuration.
+    # metrics.backend-destination field specifies the system metrics destination.
+    # It supports either prometheus (the default) or stackdriver.
+    # Note: Using Stackdriver will incur additional charges.
+    metrics.backend-destination: prometheus
+    # metrics.stackdriver-project-id field specifies the Stackdriver project ID. This
+    # field is optional. When running on GCE, application default credentials will be
+    # used and metrics will be sent to the cluster's project if this field is
+    # not provided.
+    metrics.stackdriver-project-id: "<your stackdriver project id>"
+    # metrics.allow-stackdriver-custom-metrics indicates whether it is allowed
+    # to send metrics to Stackdriver using "global" resource type and custom
+    # metric type. Setting this flag to "true" could cause extra Stackdriver
+    # charge.  If metrics.backend-destination is not Stackdriver, this is
+    # ignored.
+    metrics.allow-stackdriver-custom-metrics: "false"
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/instance: default
+  name: tekton-config-observability

operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator-webhook_v1_service.yaml

@@ -5,8 +5,8 @@ metadata:
   labels:
     app: tekton-operator
     name: tekton-operator-webhook
-    operator.tekton.dev/release: devel
-    version: v0.49.0
+    operator.tekton.dev/release: v0.50.0
+    version: v0.50.0
   name: tekton-operator-webhook
 spec:
   ports:

operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator_v1_service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app: tekton-pipelines-controller
+    version: devel
+  name: tekton-operator
+spec:
+  ports:
+  - name: http-metrics
+    port: 9090
+    protocol: TCP
+    targetPort: 9090
+  selector:
+    app: tekton-operator
+    name: tekton-operator
+status:
+  loadBalancer: {}