Migrate operator from v0.16.0 to v0.18.2 #67
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Member
Author
|
Member
Author
|
@wking: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Member
Author
|
Member
Author
Followed https://sdk.operatorframework.io/docs/upgrading-sdk-version/v0.18.0/: - modified go.mod $ go mod tidy $ go mod vendor $ chmod 0755 deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml $ chmod 0755 deploy/olm-catalog/cincinnati-operator/0.0.1/* $ operator-sdk generate crds - check that it builds $ go build -mod=vendor -o \ ~/Documents/Eng/OSUS-Operator/cincinnati-operator \ github.com/openshift/cincinnati-operator/cmd/manager
Avoid [1]: The CustomResourceDefinition "cincinnatis.cincinnati.openshift.io" is invalid: spec.validation.openAPIV3Schema.properties[metadata]: Forbidden: must not specify anything other than name and generateName, but metadata is implicitly specified On the Kubernetes 1.19 CI cluster, because metadata is validated implicitly [2]. [1]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cincinnati-operator/67/pull-ci-openshift-cincinnati-operator-master-cincinnati-operator-e2e-aws/1313249109418708992 [2]: https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
These are needed by the updated Kube clients. And trim some unused cruft out of utils.go, so we don't have to maintain dead code.
Contributor
|
/lgtm |
wking
added a commit
to wking/cincinnati-operator
that referenced
this pull request
Nov 13, 2020
Generated with:
$ find . -name '*.go' -execdir chmod 644 {} \+
$ find . -name '*.yaml' -execdir chmod 644 {} \+
Tracking one of the files:
$ git log -p --follow origin/master api/v1/groupversion_info.go | grep '^commit\|new.*mode'
...
commit d9f361a
new file mode 100755
So that was born executable in d9f361a (Migrate operator from
v0.18.2 to v0.19.3, 2020-09-30, openshift#65).
Three more buggy bits are from that commit:
$ git show d9f361a | grep -B2 'new mode'
diff --git a/pkg/apis/cincinnati/v1beta1/cincinnati_types.go b/api/v1beta1/cincinnati_types.go
old mode 100644
new mode 100755
--
diff --git a/pkg/apis/cincinnati/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
old mode 100644
new mode 100755
--
diff --git a/pkg/controller/cincinnati/cincinnati_controller.go b/controllers/cincinnati_controller.go
old mode 100644
new mode 100755
The last three are from 36a102f (Migrate operator from v0.16.0 to
v0.18.2, 2020-09-17, openshift#67):
$ git show 36a102f | grep -B2 'new mode'
diff --git a/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati-operator.v0.0.1.clusterserviceversion.yaml b/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati-operator.v0.0.1.clusterserviceversion.yaml
old mode 100644
new mode 100755
diff --git a/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati.openshift.io_cincinnatis_crd.yaml b/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati.openshift.io_cincinnatis_crd.yaml
old mode 100644
new mode 100755
diff --git a/deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml b/deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml
old mode 100644
new mode 100755
wking
added a commit
to wking/cincinnati-operator
that referenced
this pull request
Nov 13, 2020
Generated with:
$ find . -name '*.go' -execdir chmod 644 {} \+
$ find . -name '*.yaml' -execdir chmod 644 {} \+
Tracking one of the files:
$ git log -p --follow origin/master api/v1/groupversion_info.go | grep '^commit\|new.*mode'
...
commit d9f361a
new file mode 100755
So that was born executable in d9f361a (Migrate operator from
v0.18.2 to v0.19.3, 2020-09-30, openshift#65).
Three more buggy bits are from that commit:
$ git show d9f361a | grep -B2 'new mode'
diff --git a/pkg/apis/cincinnati/v1beta1/cincinnati_types.go b/api/v1beta1/cincinnati_types.go
old mode 100644
new mode 100755
--
diff --git a/pkg/apis/cincinnati/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
old mode 100644
new mode 100755
--
diff --git a/pkg/controller/cincinnati/cincinnati_controller.go b/controllers/cincinnati_controller.go
old mode 100644
new mode 100755
The last three are from 36a102f (Migrate operator from v0.16.0 to
v0.18.2, 2020-09-17, openshift#67):
$ git show 36a102f | grep -B2 'new mode'
diff --git a/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati-operator.v0.0.1.clusterserviceversion.yaml b/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati-operator.v0.0.1.clusterserviceversion.yaml
old mode 100644
new mode 100755
diff --git a/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati.openshift.io_cincinnatis_crd.yaml b/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati.openshift.io_cincinnatis_crd.yaml
old mode 100644
new mode 100755
diff --git a/deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml b/deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml
old mode 100644
new mode 100755
wking
added a commit
to wking/cincinnati-operator
that referenced
this pull request
Nov 16, 2020
Generated with:
$ find . -name '*.go' -execdir chmod 644 {} \+
$ find . -name '*.yaml' -execdir chmod 644 {} \+
Tracking one of the files:
$ git log -p --follow origin/master api/v1/groupversion_info.go | grep '^commit\|new.*mode'
...
commit d9f361a
new file mode 100755
So that was born executable in d9f361a (Migrate operator from
v0.18.2 to v0.19.3, 2020-09-30, openshift#65).
Three more buggy bits are from that commit:
$ git show d9f361a | grep -B2 'new mode'
diff --git a/pkg/apis/cincinnati/v1beta1/cincinnati_types.go b/api/v1beta1/cincinnati_types.go
old mode 100644
new mode 100755
--
diff --git a/pkg/apis/cincinnati/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
old mode 100644
new mode 100755
--
diff --git a/pkg/controller/cincinnati/cincinnati_controller.go b/controllers/cincinnati_controller.go
old mode 100644
new mode 100755
The last three are from 36a102f (Migrate operator from v0.16.0 to
v0.18.2, 2020-09-17, openshift#67):
$ git show 36a102f | grep -B2 'new mode'
diff --git a/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati-operator.v0.0.1.clusterserviceversion.yaml b/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati-operator.v0.0.1.clusterserviceversion.yaml
old mode 100644
new mode 100755
diff --git a/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati.openshift.io_cincinnatis_crd.yaml b/deploy/olm-catalog/cincinnati-operator/0.0.1/cincinnati.openshift.io_cincinnatis_crd.yaml
old mode 100644
new mode 100755
diff --git a/deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml b/deploy/olm-catalog/cincinnati-operator/cincinnati-operator.package.yaml
old mode 100644
new mode 100755
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Followed https://sdk.operatorframework.io/docs/upgrading-sdk-version/v0.18.0/:
Spun out from #65, so we can land it while continuing to work on the 0.19 and later stuff.