Skip to content

Commit

Permalink
Merge pull request #156 from nikhil-thomas/release-v0.9.0
Browse files Browse the repository at this point in the history
Release-v0.9.0
  • Loading branch information
openshift-merge-robot authored Dec 23, 2019
2 parents 3f96312 + c093e23 commit 292de22
Show file tree
Hide file tree
Showing 38 changed files with 3,337 additions and 94 deletions.
107 changes: 107 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,110 @@ osdk-image:
$(Q)operator-sdk build \
--go-build-args "-o build/_output/bin/openshift-pipelines-operator" \
$(IMAGE_TAG)

##########------------------------------------------------------------##########
##########- Operator Release------------------------------------------##########
##########------------------------------------------------------------##########

.PHONY: opo-test-clean
opo-test-clean:
-oc delete -f deploy/
-oc delete -f deploy/crds/

.PHONY: opo-up-local
opo-test-e2e-up-local: opo-test-clean
operator-sdk test local ./test/e2e/ --up-local --namespace openshift-pipelines --go-test-flags "-v -timeout=10m" --local-operator-flags "--recursive"

.PHONY: opo-test-e2e
opo-test-e2e: opo-test-clean
operator-sdk test local ./test/e2e/ --namespace openshift-operators --go-test-flags "-v -timeout=10m" --local-operator-flags "--recursive"

# make targets for release
.PHONY: opo-clean
opo-clean:
rm -rf build/_output

.PHONY: opo-image
opo-image: opo-clean
ifndef VERSION
@echo VERSION not set
@exit 1
endif
operator-sdk build quay.io/openshift-pipeline/openshift-pipelines-operator:v${VERSION}

.PHONY: opo-image-push
opo-image-push: opo-image
ifndef VERSION
@echo VERSION not set
@exit 1
endif
docker push quay.io/openshift-pipeline/openshift-pipelines-operator:v${VERSION}

.PHONY: opo-build-push-update
opo-build-push-update: opo-image-push
ifndef VERSION
@echo VERSION not set
@exit 1
endif
sed -i 's/image:.*/image: quay.io\/openshift-pipeline\/openshift-pipelines-operator:'v${VERSION}'/' deploy/operator.yaml

.PHONY: opo-new-csv
opo-new-csv:
ifndef VERSION
@echo VERSION not set
@exit 1
endif
ifndef FROM_VERSION
@echo FROM_VERSION not set
@exit 1
endif
ifndef CHANNEL
@echo CHANNEL not set
@exit 1
endif
operator-sdk olm-catalog gen-csv \
--csv-channel dev-preview \
--csv-version ${VERSION} \
--from-version ${FROM_VERSION} \
--operator-name openshift-pipelines-operator \
--update-crds

.PHONY: opo-opr-verify
opo-opr-verify:
operator-courier verify \
--ui_validate_io \
deploy/olm-catalog/openshift-pipelines-operator

.PHONY: opo-push-quay-app
opo-push-quay-app:
ifndef VERSION
@echo VERSION not set
@exit 1
endif
ifndef QUAY_NAMESPACE
@echo QUAY_NAMESPACE not set
@exit 1
endif
ifndef TOKEN
@echo TOKEN not set
@exit 1
endif
operator-courier --verbose push \
./deploy/olm-catalog/openshift-pipelines-operator \
${QUAY_NAMESPACE} \
openshift-pipelines-operator \
${VERSION} \
"${TOKEN}"

.PHONY: opo-test-scorecard
opo-test-scorecard:
ifndef VERSION
@echo VERSION not set
@exit 1
endif
operator-sdk scorecard \
--olm-deployed \
--csv-path deploy/olm-catalog/openshift-pipelines-operator/${VERSION}/openshift-pipelines-operator.v${VERSION}.clusterserviceversion.yaml \
--namespace openshift-operators \
--cr-manifest ./deploy/crds/operator_v1alpha1_config_cr.yaml \
--crds-dir .deploy/olm-catalog/openshift-pipelines-operator/${VERSION}
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ metadata:
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.
operators.operatorframework.io/internal-objects: '["config.operator.tekton.dev"]'
name: openshift-pipelines-operator.v0.9.0
namespace: placeholder
spec:
Expand Down Expand Up @@ -319,6 +319,12 @@ spec:
- '*'
verbs:
- '*'
- apiGroups:
- console.openshift.io
resources:
- consoleyamlsamples
verbs:
- '*'
serviceAccountName: openshift-pipelines-operator
deployments:
- name: openshift-pipelines-operator
Expand Down Expand Up @@ -348,7 +354,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: openshift-pipelines-operator
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.8.1
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.9.0
imagePullPolicy: Always
name: openshift-pipelines-operator
resources: {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- currentCSV: openshift-pipelines-operator.v0.8.2
- currentCSV: openshift-pipelines-operator.v0.9.0
name: canary
- currentCSV: openshift-pipelines-operator.v0.8.2
name: dev-preview
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
serviceAccountName: openshift-pipelines-operator
containers:
- name: openshift-pipelines-operator
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.8.2
image: quay.io/openshift-pipeline/openshift-pipelines-operator:v0.9.0
command:
- openshift-pipelines-operator
- --recursive
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# auto generated by script/update-tasks.sh
# DO NOT EDIT: use the script instead
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/buildah/buildah.yaml
#
---
---
apiVersion: tekton.dev/v1alpha1
kind: ClusterTask
metadata:
name: buildah
spec:
inputs:
params:
- name: BUILDER_IMAGE
description: The location of the buildah builder image.
default: quay.io/buildah/stable:v1.11.0
- name: DOCKERFILE
description: Path to the Dockerfile to build.
default: ./Dockerfile
- name: TLSVERIFY
description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
default: "true"

resources:
- name: source
type: git

outputs:
resources:
- name: image
type: image

steps:
- name: build
image: $(inputs.params.BUILDER_IMAGE)
workingDir: /workspace/source
command: ['buildah', 'bud', '--tls-verify=$(inputs.params.TLSVERIFY)', '--layers', '-f', '$(inputs.params.DOCKERFILE)', '-t', '$(outputs.resources.image.url)', '.']
volumeMounts:
- name: varlibcontainers
mountPath: /var/lib/containers
securityContext:
privileged: true

- name: push
image: $(inputs.params.BUILDER_IMAGE)
workingDir: /workspace/source
command: ['buildah', 'push', '--tls-verify=$(inputs.params.TLSVERIFY)', '$(outputs.resources.image.url)', 'docker://$(outputs.resources.image.url)']
volumeMounts:
- name: varlibcontainers
mountPath: /var/lib/containers
securityContext:
privileged: true

volumes:
- name: varlibcontainers
emptyDir: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# auto generated by script/update-tasks.sh
# DO NOT EDIT: use the script instead
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/buildah/buildah.yaml
#
---
---
apiVersion: tekton.dev/v1alpha1
kind: ClusterTask
metadata:
name: buildah-v0-8-0
spec:
inputs:
params:
- name: BUILDER_IMAGE
description: The location of the buildah builder image.
default: quay.io/buildah/stable:v1.11.0
- name: DOCKERFILE
description: Path to the Dockerfile to build.
default: ./Dockerfile
- name: TLSVERIFY
description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
default: "true"

resources:
- name: source
type: git

outputs:
resources:
- name: image
type: image

steps:
- name: build
image: $(inputs.params.BUILDER_IMAGE)
workingDir: /workspace/source
command: ['buildah', 'bud', '--tls-verify=$(inputs.params.TLSVERIFY)', '--layers', '-f', '$(inputs.params.DOCKERFILE)', '-t', '$(outputs.resources.image.url)', '.']
volumeMounts:
- name: varlibcontainers
mountPath: /var/lib/containers
securityContext:
privileged: true

- name: push
image: $(inputs.params.BUILDER_IMAGE)
workingDir: /workspace/source
command: ['buildah', 'push', '--tls-verify=$(inputs.params.TLSVERIFY)', '$(outputs.resources.image.url)', 'docker://$(outputs.resources.image.url)']
volumeMounts:
- name: varlibcontainers
mountPath: /var/lib/containers
securityContext:
privileged: true

volumes:
- name: varlibcontainers
emptyDir: {}
16 changes: 16 additions & 0 deletions deploy/resources/v0.9.2/addons/clustertasks/cluster-role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
labels:
rbac.authorization.k8s.io/aggregate-to-view: "true"
name: tekton-clustertasks-view
rules:
- apiGroups:
- tekton.dev
resources:
- clustertasks
verbs:
- get
- list
- watch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: tekton-clustertasks-view-auth
roleRef:
kind: ClusterRole
name: tekton-clustertasks-view
apiGroup: rbac.authorization.k8s.io
subjects:
- apiGroup: rbac.authorization.k8s.io
kind: Group
name: system:authenticated
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# auto generated by script/update-tasks.sh
# DO NOT EDIT: use the script instead
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/openshift-client/openshift-client-task.yaml
#
---
apiVersion: tekton.dev/v1alpha1
kind: ClusterTask
metadata:
name: openshift-client
spec:
inputs:
params:
- name: ARGS
description: The OpenShift CLI arguments to run
type: array
default:
- "help"
steps:
- name: oc
image: quay.io/openshift/origin-cli:latest
command: ["/usr/bin/oc"]
args:
- "$(inputs.params.ARGS)"
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# auto generated by script/update-tasks.sh
# DO NOT EDIT: use the script instead
# source: https://raw.githubusercontent.com/openshift/tektoncd-catalog/release-v0.8/openshift-client/openshift-client-task.yaml
#
---
apiVersion: tekton.dev/v1alpha1
kind: ClusterTask
metadata:
name: openshift-client-v0-8-0
spec:
inputs:
params:
- name: ARGS
description: The OpenShift CLI arguments to run
type: array
default:
- "help"
steps:
- name: oc
image: quay.io/openshift/origin-cli:latest
command: ["/usr/bin/oc"]
args:
- "$(inputs.params.ARGS)"
Loading

0 comments on commit 292de22

Please sign in to comment.