Skip to content

Commit 292de22

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #156 from nikhil-thomas/release-v0.9.0
Release-v0.9.0
2 parents 3f96312 + c093e23 commit 292de22

38 files changed

+3337
-94
lines changed

‎Makefile

+107
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,110 @@ osdk-image:
6464
$(Q)operator-sdk build \
6565
--go-build-args "-o build/_output/bin/openshift-pipelines-operator" \
6666
$(IMAGE_TAG)
67+
68+
##########------------------------------------------------------------##########
69+
##########- Operator Release------------------------------------------##########
70+
##########------------------------------------------------------------##########
71+
72+
.PHONY: opo-test-clean
73+
opo-test-clean:
74+
-oc delete -f deploy/
75+
-oc delete -f deploy/crds/
76+
77+
.PHONY: opo-up-local
78+
opo-test-e2e-up-local: opo-test-clean
79+
operator-sdk test local ./test/e2e/ --up-local --namespace openshift-pipelines --go-test-flags "-v -timeout=10m" --local-operator-flags "--recursive"
80+
81+
.PHONY: opo-test-e2e
82+
opo-test-e2e: opo-test-clean
83+
operator-sdk test local ./test/e2e/ --namespace openshift-operators --go-test-flags "-v -timeout=10m" --local-operator-flags "--recursive"
84+
85+
# make targets for release
86+
.PHONY: opo-clean
87+
opo-clean:
88+
rm -rf build/_output
89+
90+
.PHONY: opo-image
91+
opo-image: opo-clean
92+
ifndef VERSION
93+
@echo VERSION not set
94+
@exit 1
95+
endif
96+
operator-sdk build quay.io/openshift-pipeline/openshift-pipelines-operator:v${VERSION}
97+
98+
.PHONY: opo-image-push
99+
opo-image-push: opo-image
100+
ifndef VERSION
101+
@echo VERSION not set
102+
@exit 1
103+
endif
104+
docker push quay.io/openshift-pipeline/openshift-pipelines-operator:v${VERSION}
105+
106+
.PHONY: opo-build-push-update
107+
opo-build-push-update: opo-image-push
108+
ifndef VERSION
109+
@echo VERSION not set
110+
@exit 1
111+
endif
112+
sed -i 's/image:.*/image: quay.io\/openshift-pipeline\/openshift-pipelines-operator:'v${VERSION}'/' deploy/operator.yaml
113+
114+
.PHONY: opo-new-csv
115+
opo-new-csv:
116+
ifndef VERSION
117+
@echo VERSION not set
118+
@exit 1
119+
endif
120+
ifndef FROM_VERSION
121+
@echo FROM_VERSION not set
122+
@exit 1
123+
endif
124+
ifndef CHANNEL
125+
@echo CHANNEL not set
126+
@exit 1
127+
endif
128+
operator-sdk olm-catalog gen-csv \
129+
--csv-channel dev-preview \
130+
--csv-version ${VERSION} \
131+
--from-version ${FROM_VERSION} \
132+
--operator-name openshift-pipelines-operator \
133+
--update-crds
134+
135+
.PHONY: opo-opr-verify
136+
opo-opr-verify:
137+
operator-courier verify \
138+
--ui_validate_io \
139+
deploy/olm-catalog/openshift-pipelines-operator
140+
141+
.PHONY: opo-push-quay-app
142+
opo-push-quay-app:
143+
ifndef VERSION
144+
@echo VERSION not set
145+
@exit 1
146+
endif
147+
ifndef QUAY_NAMESPACE
148+
@echo QUAY_NAMESPACE not set
149+
@exit 1
150+
endif
151+
ifndef TOKEN
152+
@echo TOKEN not set
153+
@exit 1
154+
endif
155+
operator-courier --verbose push \
156+
./deploy/olm-catalog/openshift-pipelines-operator \
157+
${QUAY_NAMESPACE} \
158+
openshift-pipelines-operator \
159+
${VERSION} \
160+
"${TOKEN}"
161+
162+
.PHONY: opo-test-scorecard
163+
opo-test-scorecard:
164+
ifndef VERSION
165+
@echo VERSION not set
166+
@exit 1
167+
endif
168+
operator-sdk scorecard \
169+
--olm-deployed \
170+
--csv-path deploy/olm-catalog/openshift-pipelines-operator/${VERSION}/openshift-pipelines-operator.v${VERSION}.clusterserviceversion.yaml \
171+
--namespace openshift-operators \
172+
--cr-manifest ./deploy/crds/operator_v1alpha1_config_cr.yaml \
173+
--crds-dir .deploy/olm-catalog/openshift-pipelines-operator/${VERSION}

‎deploy/olm-catalog/openshift-pipelines-operator/0.9.0/openshift-pipelines-operator.v0.9.0.clusterserviceversion.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ metadata:
1010
createdAt: "2019-03-15T19:44:21Z"
1111
description: OpenShift Pipelines is a cloud-native CI/CD solution for building
1212
pipelines using Tekton concepts which run natively on OpenShift and Kubernetes.
13+
operators.operatorframework.io/internal-objects: '["config.operator.tekton.dev"]'
1314
repository: https://github.com/openshift/tektoncd-pipeline-operator
1415
support: Red Hat, Inc.
15-
operators.operatorframework.io/internal-objects: '["config.operator.tekton.dev"]'
1616
name: openshift-pipelines-operator.v0.9.0
1717
namespace: placeholder
1818
spec:
@@ -319,6 +319,12 @@ spec:
319319
- '*'
320320
verbs:
321321
- '*'
322+
- apiGroups:
323+
- console.openshift.io
324+
resources:
325+
- consoleyamlsamples
326+
verbs:
327+
- '*'
322328
serviceAccountName: openshift-pipelines-operator
323329
deployments:
324330
- name: openshift-pipelines-operator
@@ -348,7 +354,7 @@ spec:
348354
fieldPath: metadata.name
349355
- name: OPERATOR_NAME
350356
value: openshift-pipelines-operator
351-
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.8.1
357+
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.9.0
352358
imagePullPolicy: Always
353359
name: openshift-pipelines-operator
354360
resources: {}

‎deploy/olm-catalog/openshift-pipelines-operator/openshift-pipelines-operator.package.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
channels:
2-
- currentCSV: openshift-pipelines-operator.v0.8.2
2+
- currentCSV: openshift-pipelines-operator.v0.9.0
33
name: canary
44
- currentCSV: openshift-pipelines-operator.v0.8.2
55
name: dev-preview

‎deploy/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
serviceAccountName: openshift-pipelines-operator
1717
containers:
1818
- name: openshift-pipelines-operator
19-
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.8.2
19+
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.9.0
2020
command:
2121
- openshift-pipelines-operator
2222
- --recursive

‎deploy/resources/v0.9.2/addons/clustertasks/buildah/buildah-task.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# auto generated by script/update-tasks.sh
2+
# DO NOT EDIT: use the script instead
3+
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/buildah/buildah.yaml
4+
#
5+
---
6+
---
7+
apiVersion: tekton.dev/v1alpha1
8+
kind: ClusterTask
9+
metadata:
10+
name: buildah
11+
spec:
12+
inputs:
13+
params:
14+
- name: BUILDER_IMAGE
15+
description: The location of the buildah builder image.
16+
default: quay.io/buildah/stable:v1.11.0
17+
- name: DOCKERFILE
18+
description: Path to the Dockerfile to build.
19+
default: ./Dockerfile
20+
- name: TLSVERIFY
21+
description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
22+
default: "true"
23+
24+
resources:
25+
- name: source
26+
type: git
27+
28+
outputs:
29+
resources:
30+
- name: image
31+
type: image
32+
33+
steps:
34+
- name: build
35+
image: $(inputs.params.BUILDER_IMAGE)
36+
workingDir: /workspace/source
37+
command: ['buildah', 'bud', '--tls-verify=$(inputs.params.TLSVERIFY)', '--layers', '-f', '$(inputs.params.DOCKERFILE)', '-t', '$(outputs.resources.image.url)', '.']
38+
volumeMounts:
39+
- name: varlibcontainers
40+
mountPath: /var/lib/containers
41+
securityContext:
42+
privileged: true
43+
44+
- name: push
45+
image: $(inputs.params.BUILDER_IMAGE)
46+
workingDir: /workspace/source
47+
command: ['buildah', 'push', '--tls-verify=$(inputs.params.TLSVERIFY)', '$(outputs.resources.image.url)', 'docker://$(outputs.resources.image.url)']
48+
volumeMounts:
49+
- name: varlibcontainers
50+
mountPath: /var/lib/containers
51+
securityContext:
52+
privileged: true
53+
54+
volumes:
55+
- name: varlibcontainers
56+
emptyDir: {}

‎deploy/resources/v0.9.2/addons/clustertasks/buildah/buildah-v0-8-0-task.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# auto generated by script/update-tasks.sh
2+
# DO NOT EDIT: use the script instead
3+
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/buildah/buildah.yaml
4+
#
5+
---
6+
---
7+
apiVersion: tekton.dev/v1alpha1
8+
kind: ClusterTask
9+
metadata:
10+
name: buildah-v0-8-0
11+
spec:
12+
inputs:
13+
params:
14+
- name: BUILDER_IMAGE
15+
description: The location of the buildah builder image.
16+
default: quay.io/buildah/stable:v1.11.0
17+
- name: DOCKERFILE
18+
description: Path to the Dockerfile to build.
19+
default: ./Dockerfile
20+
- name: TLSVERIFY
21+
description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
22+
default: "true"
23+
24+
resources:
25+
- name: source
26+
type: git
27+
28+
outputs:
29+
resources:
30+
- name: image
31+
type: image
32+
33+
steps:
34+
- name: build
35+
image: $(inputs.params.BUILDER_IMAGE)
36+
workingDir: /workspace/source
37+
command: ['buildah', 'bud', '--tls-verify=$(inputs.params.TLSVERIFY)', '--layers', '-f', '$(inputs.params.DOCKERFILE)', '-t', '$(outputs.resources.image.url)', '.']
38+
volumeMounts:
39+
- name: varlibcontainers
40+
mountPath: /var/lib/containers
41+
securityContext:
42+
privileged: true
43+
44+
- name: push
45+
image: $(inputs.params.BUILDER_IMAGE)
46+
workingDir: /workspace/source
47+
command: ['buildah', 'push', '--tls-verify=$(inputs.params.TLSVERIFY)', '$(outputs.resources.image.url)', 'docker://$(outputs.resources.image.url)']
48+
volumeMounts:
49+
- name: varlibcontainers
50+
mountPath: /var/lib/containers
51+
securityContext:
52+
privileged: true
53+
54+
volumes:
55+
- name: varlibcontainers
56+
emptyDir: {}

‎deploy/resources/v0.9.2/addons/clustertasks/cluster-role.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
annotations:
5+
labels:
6+
rbac.authorization.k8s.io/aggregate-to-view: "true"
7+
name: tekton-clustertasks-view
8+
rules:
9+
- apiGroups:
10+
- tekton.dev
11+
resources:
12+
- clustertasks
13+
verbs:
14+
- get
15+
- list
16+
- watch

‎deploy/resources/v0.9.2/addons/clustertasks/cluster-rolebinding.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
kind: ClusterRoleBinding
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
metadata:
4+
name: tekton-clustertasks-view-auth
5+
roleRef:
6+
kind: ClusterRole
7+
name: tekton-clustertasks-view
8+
apiGroup: rbac.authorization.k8s.io
9+
subjects:
10+
- apiGroup: rbac.authorization.k8s.io
11+
kind: Group
12+
name: system:authenticated

‎deploy/resources/v0.9.2/addons/clustertasks/openshift-client/openshift-client-task.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# auto generated by script/update-tasks.sh
2+
# DO NOT EDIT: use the script instead
3+
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/openshift-client/openshift-client-task.yaml
4+
#
5+
---
6+
apiVersion: tekton.dev/v1alpha1
7+
kind: ClusterTask
8+
metadata:
9+
name: openshift-client
10+
spec:
11+
inputs:
12+
params:
13+
- name: ARGS
14+
description: The OpenShift CLI arguments to run
15+
type: array
16+
default:
17+
- "help"
18+
steps:
19+
- name: oc
20+
image: quay.io/openshift/origin-cli:latest
21+
command: ["/usr/bin/oc"]
22+
args:
23+
- "$(inputs.params.ARGS)"

‎deploy/resources/v0.9.2/addons/clustertasks/openshift-client/openshift-client-v0-8-0-task.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# auto generated by script/update-tasks.sh
2+
# DO NOT EDIT: use the script instead
3+
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/openshift-client/openshift-client-task.yaml
4+
#
5+
---
6+
apiVersion: tekton.dev/v1alpha1
7+
kind: ClusterTask
8+
metadata:
9+
name: openshift-client-v0-8-0
10+
spec:
11+
inputs:
12+
params:
13+
- name: ARGS
14+
description: The OpenShift CLI arguments to run
15+
type: array
16+
default:
17+
- "help"
18+
steps:
19+
- name: oc
20+
image: quay.io/openshift/origin-cli:latest
21+
command: ["/usr/bin/oc"]
22+
args:
23+
- "$(inputs.params.ARGS)"

0 commit comments

Comments
 (0)