diff --git a/Makefile b/Makefile index 64be8a04fe..44bd5b0b0a 100644 --- a/Makefile +++ b/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 diff --git a/config/kubernetes/300-operator_v1alpha1_dashboard_crd.yaml b/config/kubernetes/base/300-operator_v1alpha1_dashboard_crd.yaml similarity index 100% rename from config/kubernetes/300-operator_v1alpha1_dashboard_crd.yaml rename to config/kubernetes/base/300-operator_v1alpha1_dashboard_crd.yaml diff --git a/config/kubernetes/300-operator_v1alpha1_result_crd.yaml b/config/kubernetes/base/300-operator_v1alpha1_result_crd.yaml similarity index 100% rename from config/kubernetes/300-operator_v1alpha1_result_crd.yaml rename to config/kubernetes/base/300-operator_v1alpha1_result_crd.yaml diff --git a/config/kubernetes/kustomization.yaml b/config/kubernetes/base/kustomization.yaml similarity index 94% rename from config/kubernetes/kustomization.yaml rename to config/kubernetes/base/kustomization.yaml index daf8fd9857..6972d67834 100644 --- a/config/kubernetes/kustomization.yaml +++ b/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 diff --git a/config/kubernetes/operator.yaml b/config/kubernetes/base/operator.yaml similarity index 100% rename from config/kubernetes/operator.yaml rename to config/kubernetes/base/operator.yaml diff --git a/config/kubernetes/operator_service.yaml b/config/kubernetes/base/operator_service.yaml similarity index 100% rename from config/kubernetes/operator_service.yaml rename to config/kubernetes/base/operator_service.yaml diff --git a/config/kubernetes/webhook.yaml b/config/kubernetes/base/webhook.yaml similarity index 100% rename from config/kubernetes/webhook.yaml rename to config/kubernetes/base/webhook.yaml diff --git a/config/kubernetes/overlays/default/kustomization.yaml b/config/kubernetes/overlays/default/kustomization.yaml new file mode 100644 index 0000000000..9030867bff --- /dev/null +++ b/config/kubernetes/overlays/default/kustomization.yaml @@ -0,0 +1,4 @@ +namespace: tekton-operator +resources: +- ../../base/ +- service_account.yaml diff --git a/config/kubernetes/service_account.yaml b/config/kubernetes/overlays/default/service_account.yaml similarity index 100% rename from config/kubernetes/service_account.yaml rename to config/kubernetes/overlays/default/service_account.yaml diff --git a/config/kubernetes/overlays/operatorhub/kustomization.yaml b/config/kubernetes/overlays/operatorhub/kustomization.yaml new file mode 100644 index 0000000000..d625b98c98 --- /dev/null +++ b/config/kubernetes/overlays/operatorhub/kustomization.yaml @@ -0,0 +1,3 @@ +namespace: tekton-operator +resources: +- ../../base/ diff --git a/config/openshift/100-namespace.yaml b/config/openshift/base/100-namespace.yaml similarity index 100% rename from config/openshift/100-namespace.yaml rename to config/openshift/base/100-namespace.yaml diff --git a/config/openshift/300-operator_v1alpha1_addon_crd.yaml b/config/openshift/base/300-operator_v1alpha1_addon_crd.yaml similarity index 100% rename from config/openshift/300-operator_v1alpha1_addon_crd.yaml rename to config/openshift/base/300-operator_v1alpha1_addon_crd.yaml diff --git a/config/openshift/500-webhooks.yaml b/config/openshift/base/500-webhooks.yaml similarity index 100% rename from config/openshift/500-webhooks.yaml rename to config/openshift/base/500-webhooks.yaml diff --git a/config/openshift/kustomization.yaml b/config/openshift/base/kustomization.yaml similarity index 95% rename from config/openshift/kustomization.yaml rename to config/openshift/base/kustomization.yaml index 5404caea73..df9f660425 100644 --- a/config/openshift/kustomization.yaml +++ b/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 diff --git a/config/openshift/operator.yaml b/config/openshift/base/operator.yaml similarity index 100% rename from config/openshift/operator.yaml rename to config/openshift/base/operator.yaml diff --git a/config/openshift/operator_service.yaml b/config/openshift/base/operator_service.yaml similarity index 100% rename from config/openshift/operator_service.yaml rename to config/openshift/base/operator_service.yaml diff --git a/config/openshift/operator_servicemonitor.yaml b/config/openshift/base/operator_servicemonitor.yaml similarity index 100% rename from config/openshift/operator_servicemonitor.yaml rename to config/openshift/base/operator_servicemonitor.yaml diff --git a/config/openshift/role.yaml b/config/openshift/base/role.yaml similarity index 100% rename from config/openshift/role.yaml rename to config/openshift/base/role.yaml diff --git a/config/openshift/role_binding.yaml b/config/openshift/base/role_binding.yaml similarity index 100% rename from config/openshift/role_binding.yaml rename to config/openshift/base/role_binding.yaml diff --git a/config/openshift/webhook.yaml b/config/openshift/base/webhook.yaml similarity index 100% rename from config/openshift/webhook.yaml rename to config/openshift/base/webhook.yaml diff --git a/config/openshift/overlays/default/kustomization.yaml b/config/openshift/overlays/default/kustomization.yaml new file mode 100644 index 0000000000..197bdbb1f1 --- /dev/null +++ b/config/openshift/overlays/default/kustomization.yaml @@ -0,0 +1,4 @@ +namespace: openshift-operators +resources: +- ../../base/ +- service_account.yaml diff --git a/config/openshift/service_account.yaml b/config/openshift/overlays/default/service_account.yaml similarity index 100% rename from config/openshift/service_account.yaml rename to config/openshift/overlays/default/service_account.yaml diff --git a/config/openshift/overlays/operatorhub/kustomization.yaml b/config/openshift/overlays/operatorhub/kustomization.yaml new file mode 100644 index 0000000000..019772aaaa --- /dev/null +++ b/config/openshift/overlays/operatorhub/kustomization.yaml @@ -0,0 +1,3 @@ +namespace: openshift-operators +resources: +- ../../base/ diff --git a/operatorhub/kubernetes/manifests/fetch-strategy-local/kustomization.yaml b/operatorhub/kubernetes/manifests/fetch-strategy-local/kustomization.yaml index 503b5aec6d..1681f279e6 100644 --- a/operatorhub/kubernetes/manifests/fetch-strategy-local/kustomization.yaml +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonconfigs.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonconfigs.yaml index d6a2d981cd..9204af76f0 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonconfigs.yaml +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektondashboards.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektondashboards.yaml index 5ed34f0643..191cbab2b1 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektondashboards.yaml +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektoninstallersets.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektoninstallersets.yaml new file mode 100644 index 0000000000..65a6d84433 --- /dev/null +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonpipelines.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonpipelines.yaml index c122a7bbd8..386039a1ea 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonpipelines.yaml +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonresults.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonresults.yaml index 6c908a7378..8c2a73726b 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektonresults.yaml +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektontriggers.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektontriggers.yaml index 47825721f0..6384352fc3 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/operator.tekton.dev_tektontriggers.yaml +++ b/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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-config-observability_v1_configmap.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-config-observability_v1_configmap.yaml new file mode 100644 index 0000000000..d91bf71ea7 --- /dev/null +++ b/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: "" + # 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 diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator-webhook_v1_service.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator-webhook_v1_service.yaml index 257d46ac72..af8ad77e13 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator-webhook_v1_service.yaml +++ b/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: diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator_v1_service.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tekton-operator_v1_service.yaml new file mode 100644 index 0000000000..0a1eeec0d0 --- /dev/null +++ b/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: {} diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml index 1d1e9d2497..5f121b0ada 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml +++ b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml @@ -4,12 +4,17 @@ metadata: annotations: alm-examples: "[\n {\n \"apiVersion\": \"operator.tekton.dev/v1alpha1\",\n\ \ \"kind\": \"TektonConfig\",\n \"metadata\": {\n \"name\": \"config\"\ - \n },\n \"spec\": {\n \"profile\": \"all\",\n \"targetNamespace\"\ - : \"tekton-pipelines\"\n }\n },\n {\n \"apiVersion\": \"operator.tekton.dev/v1alpha1\"\ - ,\n \"kind\": \"TektonDashboard\",\n \"metadata\": {\n \"name\":\ - \ \"dashboard\"\n },\n \"spec\": {\n \"targetNamespace\": \"tekton-pipelines\"\ - \n }\n },\n {\n \"apiVersion\": \"operator.tekton.dev/v1alpha1\",\n\ - \ \"kind\": \"TektonPipeline\",\n \"metadata\": {\n \"name\": \"\ + \n },\n \"spec\": {\n \"profile\": \"all\",\n \"pruner\": {\n\ + \ \"keep\": 100,\n \"resources\": [\n \"pipelinerun\"\ + ,\n \"taskrun\"\n ],\n \"schedule\": \"0 8 * * *\"\n\ + \ },\n \"targetNamespace\": \"tekton-pipelines\"\n }\n },\n {\n\ + \ \"apiVersion\": \"operator.tekton.dev/v1alpha1\",\n \"kind\": \"TektonDashboard\"\ + ,\n \"metadata\": {\n \"name\": \"dashboard\"\n },\n \"spec\"\ + : {\n \"targetNamespace\": \"tekton-pipelines\"\n }\n },\n {\n \ + \ \"apiVersion\": \"operator.tekton.dev/v1alpha1\",\n \"kind\": \"TektonInstallerSet\"\ + ,\n \"metadata\": {\n \"name\": \"foo\"\n },\n \"spec\": {\n \ + \ \"manifests\": []\n }\n },\n {\n \"apiVersion\": \"operator.tekton.dev/v1alpha1\"\ + ,\n \"kind\": \"TektonPipeline\",\n \"metadata\": {\n \"name\": \"\ pipeline\"\n },\n \"spec\": {\n \"targetNamespace\": \"tekton-pipelines\"\ \n }\n },\n {\n \"apiVersion\": \"operator.tekton.dev/v1alpha1\",\n\ \ \"kind\": \"TektonResult\",\n \"metadata\": {\n \"name\": \"result\"\ @@ -27,15 +32,12 @@ metadata: operators.operatorframework.io/project_layout: unknown repository: https://github.com/tektoncd/operator support: The Tetkon Authors - name: tektoncd-operator.v0.49.0 + name: tektoncd-operator.v0.50.0 namespace: placeholder spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - kind: TektonAddon - name: tektonaddons.operator.tekton.dev - version: v1alpha1 - description: 'TektonConfig installs Tekton Pipelines, Tekton Triggers and Tekton Dashboard on a cluster. The operator installs @@ -69,6 +71,9 @@ spec: kind: TektonDashboard name: tektondashboards.operator.tekton.dev version: v1alpha1 + - kind: TektonInstallerSet + name: tektoninstallersets.operator.tekton.dev + version: v1alpha1 - description: 'TektonPipeline installs Tekton Pipelines on a cluster. The operator installs Tekton Pipelines on a cluster @@ -367,7 +372,14 @@ spec: - pods/log - limitranges verbs: - - '*' + - delete + - deletecollection + - create + - patch + - get + - list + - update + - watch - apiGroups: - extensions - apps @@ -403,7 +415,14 @@ spec: - statefulsets - deployments/finalizers verbs: - - '*' + - get + - list + - create + - update + - delete + - deletecollection + - patch + - watch - apiGroups: - monitoring.coreos.com resources: @@ -434,6 +453,7 @@ spec: - delete - patch - watch + - impersonate - apiGroups: - rbac.authorization.k8s.io resources: @@ -524,22 +544,74 @@ spec: - '*' - tektonaddons verbs: - - '*' + - get + - list + - create + - update + - delete + - deletecollection + - patch + - watch - apiGroups: - tekton.dev + resources: + - tasks + - clustertasks + - taskruns + - pipelines + - pipelineruns + - pipelineresources + - conditions + - tasks/status + - clustertasks/status + - taskruns/status + - pipelines/status + - pipelineruns/status + - pipelineresources/status + - taskruns/finalizers + - pipelineruns/finalizers + - runs + - runs/status + - runs/finalizers + verbs: + - get + - list + - create + - update + - delete + - deletecollection + - patch + - watch + - apiGroups: - triggers.tekton.dev - operator.tekton.dev resources: - '*' verbs: - - '*' + - add + - get + - list + - create + - update + - delete + - deletecollection + - patch + - watch - apiGroups: - dashboard.tekton.dev resources: - '*' - tektonaddons + - extensions verbs: - - '*' + - get + - list + - create + - update + - delete + - deletecollection + - patch + - watch - apiGroups: - security.openshift.io resources: @@ -563,13 +635,27 @@ spec: resources: - horizontalpodautoscalers verbs: - - '*' + - delete + - deletecollection + - create + - patch + - get + - list + - update + - watch - apiGroups: - policy resources: - poddisruptionbudgets verbs: - - '*' + - delete + - deletecollection + - create + - patch + - get + - list + - update + - watch - apiGroups: - serving.knative.dev resources: @@ -627,7 +713,14 @@ spec: resources: - '*' verbs: - - '*' + - delete + - deletecollection + - create + - patch + - get + - list + - update + - watch serviceAccountName: tekton-operator deployments: - name: tekton-operator @@ -645,10 +738,6 @@ spec: spec: containers: - env: - - name: IMAGE_PIPELINES_PROXY - value: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/proxy-webhook@sha256:561dc8867bb94007208806178d24efff59a290f4082b6e72a0406d8532060c18 - - name: IMAGE_JOB_PRUNER_TKN - value: gcr.io/tekton-releases/dogfooding/tkn@sha256:f69a02ef099d8915e9e4ea1b74e43b7a9309fc97cf23cb457ebf191e73491677 - name: SYSTEM_NAMESPACE valueFrom: fieldRef: @@ -659,6 +748,16 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: tekton-operator + - name: IMAGE_PIPELINES_PROXY + value: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/proxy-webhook@sha256:92609a303f151781f58c24ac72deab67d12b9fa7553ee14b4d6e9ae5f7e0d9d9 + - name: IMAGE_JOB_PRUNER_TKN + value: gcr.io/tekton-releases/dogfooding/tkn@sha256:025de221fb059ca24a3b2d988889ea34bce48dc76c0cf0d6b4499edb8c21325f + - name: METRICS_DOMAIN + value: tekton.dev/operator + - name: VERSION + value: devel + - name: CONFIG_OBSERVABILITY_NAME + value: tekton-config-observability - name: AUTOINSTALL_COMPONENTS valueFrom: configMapKeyRef: @@ -669,7 +768,8 @@ spec: configMapKeyRef: key: DEFAULT_TARGET_NAMESPACE name: tekton-config-defaults - image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/operator@sha256:bd055c27d897f327ddb4e846782fccfda3b1d3d2397d5c764d8038547acde391 + image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/operator@sha256:fc77b6184ab793afa284081cab1d24d1d97a3c5dde9bb59a7ee0f4b4cb27e023 + imagePullPolicy: Always name: tekton-operator resources: {} serviceAccountName: tekton-operator @@ -698,8 +798,10 @@ spec: value: tekton-operator-webhook - name: WEBHOOK_SECRET_NAME value: tekton-operator-webhook-certs - image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/webhook@sha256:25374b5e15738301b1173e7397248aa46419e164a99d2d8a1343204f02e0e75d - name: webhook + - name: METRICS_DOMAIN + value: tekton.dev/operator + image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/webhook@sha256:dd0c69a8f3fbe24b8d3959a11e87f22306e19e2427e0a7e11481dea80f0b1ef0 + name: tekton-operator-webhook ports: - containerPort: 8443 name: https-webhook @@ -736,7 +838,7 @@ spec: maturity: alpha provider: name: The Tekton Authors - version: 0.49.0 + version: 0.50.0 webhookdefinitions: - admissionReviewVersions: - v1beta1 diff --git a/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml b/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml index 773a1744c7..b1b9f75653 100644 --- a/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml +++ b/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml @@ -3,7 +3,7 @@ kind: ClusterServiceVersion metadata: annotations: alm-examples: '[]' - capabilities: Seamless Upgrades + capabilities: Full Lifecycle categories: Developer Tools, Integration & Delivery certified: "false" description: Red Hat OpenShift Pipelines is a cloud-native CI/CD solution for building pipelines using Tekton concepts which run natively on OpenShift and Kubernetes. @@ -202,10 +202,7 @@ spec: ## CLI (tkn) Tekton Pipelines cli project provides a CLI (tkn) for interacting with OpenShift Pipelines. - [Download tkn for Linux](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-linux-amd64-0.17.2.tar.gz) - - [Download tkn for Mac](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-macos-amd64-0.17.2.tar.gz) - - [Download tkn for Windows](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-windows-amd64-0.17.2.zip) - - [Download tkn for IBM Power](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-linux-ppc64le-0.17.2.tar.gz) - - [Download tkn for IBM Z](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-linux-s390x-0.17.2.tar.gz) + [Download tkn](/command-line-tools) (links will be available on `command line tools` page after this operator is installed). displayName: Red Hat OpenShift Pipelines icon: - base64data: | diff --git a/operatorhub/openshift/manifests/fetch-strategy-local/kustomization.yaml b/operatorhub/openshift/manifests/fetch-strategy-local/kustomization.yaml index 29ba74176a..e8574f2387 100644 --- a/operatorhub/openshift/manifests/fetch-strategy-local/kustomization.yaml +++ b/operatorhub/openshift/manifests/fetch-strategy-local/kustomization.yaml @@ -1,5 +1,5 @@ resources: -- ../../../../config/openshift +- ../../../../config/openshift/overlays/operatorhub - ../../../../config/crs/openshift - ../bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml - ../../scorecard diff --git a/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml b/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml index c87d9ae510..f4e2fb1ac2 100644 --- a/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml +++ b/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml @@ -26,7 +26,7 @@ metadata: : \"TektonTrigger\",\n \"metadata\": {\n \"name\": \"trigger\"\n \ \ },\n \"spec\": {\n \"targetNamespace\": \"openshift-pipelines\"\n\ \ }\n }\n]" - capabilities: Seamless Upgrades + capabilities: Full Lifecycle categories: Developer Tools, Integration & Delivery certified: 'false' description: Red Hat OpenShift Pipelines is a cloud-native CI/CD solution for @@ -241,7 +241,7 @@ spec: ### Components - - Tekton Pipelines: v0.28.0 + - Tekton Pipelines: v0.28.1 - Tekton Triggers: v0.16.0 @@ -259,15 +259,9 @@ spec: Tekton Pipelines cli project provides a CLI (tkn) for interacting with OpenShift Pipelines. - - [Download tkn for Linux](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-linux-amd64-0.17.2.tar.gz) - - [Download tkn for Mac](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-macos-amd64-0.17.2.tar.gz) - - - [Download tkn for Windows](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-windows-amd64-0.17.2.zip) - - - [Download tkn for IBM Power](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-linux-ppc64le-0.17.2.tar.gz) - - - [Download tkn for IBM Z](https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/0.17.2/tkn-linux-s390x-0.17.2.tar.gz) + [Download tkn](/command-line-tools) (links will be available on `command line + tools` page after this operator is installed). ' displayName: Red Hat OpenShift Pipelines @@ -849,6 +843,8 @@ spec: value: registry.redhat.io/ocp-tools-4-tech-preview/source-to-image-rhel8@ - name: IMAGE_ADDONS_PARAM_TKN_IMAGE value: registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8@ + - name: IMAGE_ADDONS_TKN_CLI_SERVE + value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel8@ image: registry.redhat.io/openshift-pipelines/pipelines-rhel8-operator@ imagePullPolicy: Always name: openshift-pipelines-operator @@ -959,7 +955,9 @@ spec: name: IMAGE_JOB_PRUNER_TKN - image: registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8@ name: IMAGE_ADDONS_PARAM_TKN_IMAGE - - image: ko://github.com/tektoncd/operator/cmd/openshift/webhook + - image: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel8@ + name: IMAGE_ADDONS_TKN_CLI_SERVE + - image: registry.redhat.io/openshift-pipelines/pipelines-operator-webhook-rhel8@ name: TEKTON_OPERATOR_WEBHOOK replaces: 1.5.2 version: 1.6.0 diff --git a/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator_v1_serviceaccount.yaml b/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator_v1_serviceaccount.yaml deleted file mode 100644 index 3279cb6328..0000000000 --- a/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator_v1_serviceaccount.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - creationTimestamp: null - name: openshift-pipelines-operator diff --git a/tekton/build-publish-images-manifests.yaml b/tekton/build-publish-images-manifests.yaml index d8bf397e08..ca4b885f2a 100644 --- a/tekton/build-publish-images-manifests.yaml +++ b/tekton/build-publish-images-manifests.yaml @@ -116,15 +116,17 @@ spec: # Rewrite "devel" to params.versionTag sed -i -e 's/\(operator.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\("-version"\), "devel"/\1, "$(params.versionTag)"/g' ${PROJECT_ROOT}/config/base/*.yaml + sed -i -e 's/\(operator.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\("-version"\), "devel"/\1, "$(params.versionTag)"/g' ${PROJECT_ROOT}/config/${KUBE_DISTRO}/base/*.yaml + sed -i -e 's/\(operator.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\("-version"\), "devel"/\1, "$(params.versionTag)"/g' ${PROJECT_ROOT}/config/${KUBE_DISTRO}/overlays/default/*.yaml # Publish images and create release.yaml mkdir -p $OUTPUT_RELEASE_DIR - kustomize build ${PROJECT_ROOT}/config/${KUBE_DISTRO} | ko resolve --platform=$(params.platforms) --preserve-import-paths -t $(params.versionTag) -f - > $OUTPUT_RELEASE_DIR/release.yaml + kustomize build ${PROJECT_ROOT}/config/${KUBE_DISTRO}/overlays/default | ko resolve --platform=$(params.platforms) --preserve-import-paths -t $(params.versionTag) -f - > $OUTPUT_RELEASE_DIR/release.yaml # Publish images and create release.notags.yaml # This is useful if your container runtime doesn't support the `image-reference:tag@digest` notation # This is currently the case for `cri-o` (and most likely others) - kustomize build ${PROJECT_ROOT}/config/${KUBE_DISTRO} | ko resolve --platform=$(params.platforms) --preserve-import-paths -f - > $OUTPUT_RELEASE_DIR/release.notags.yaml + kustomize build ${PROJECT_ROOT}/config/${KUBE_DISTRO}/overlays/default | ko resolve --platform=$(params.platforms) --preserve-import-paths -f - > $OUTPUT_RELEASE_DIR/release.notags.yaml - name: koparse image: gcr.io/tekton-releases/dogfooding/koparse:latest