Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CM-190: Rebase v1.13 #143

Merged
merged 12 commits into from Oct 19, 2023
Merged

CM-190: Rebase v1.13 #143

merged 12 commits into from Oct 19, 2023

Conversation

swghosh
Copy link
Member

@swghosh swghosh commented Sep 15, 2023

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

go get github.com/cert-manager/cert-manager@v1.13.1
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@v1.13.1
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 15, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 15, 2023

@swghosh: This pull request references CM-189 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor
  • skipRange in CSV
  • openshift/release CI update related PRs
    • operand image mirroring with new tag
    • ci pipeline use updated operand image tags

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 15, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 15, 2023

@swghosh: This pull request references CM-189 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor
  • skipRange in CSV
  • openshift/release CI update related PRs
    • operand image mirroring with new tag
    • ci pipeline use updated operand image tags

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@swghosh
Copy link
Member Author

swghosh commented Sep 15, 2023

/cc @thejasn @chiragkyal

@swghosh swghosh changed the title CM-189: Rebase v1.13.0 CM-190: Rebase v1.13.0 Sep 15, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 15, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor
  • skipRange in CSV
  • openshift/release CI update related PRs
    • operand image mirroring with new tag
    • ci pipeline use updated operand image tags

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 18, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@swghosh swghosh marked this pull request as ready for review September 18, 2023 09:44
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 18, 2023
@swghosh swghosh marked this pull request as draft September 18, 2023 09:44
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 18, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 18, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 20, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@swghosh swghosh marked this pull request as ready for review September 20, 2023 09:52
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 20, 2023
@swghosh
Copy link
Member Author

swghosh commented Sep 20, 2023

/test all

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 20, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 20, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@chiragkyal
Copy link
Member

/test all

@swghosh swghosh force-pushed the rebase-1.13.0 branch 2 times, most recently from 3313737 to e441fe9 Compare September 20, 2023 14:50
@swghosh
Copy link
Member Author

swghosh commented Sep 21, 2023

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 9, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

go get github.com/cert-manager/cert-manager@v1.13.1
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@v1.13.1
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 11, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

go get github.com/cert-manager/cert-manager@v1.13.1
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@v1.13.1
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@swghosh
Copy link
Member Author

swghosh commented Oct 17, 2023

/test all

go.sum Outdated Show resolved Hide resolved
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
* controller-runtime
* controller-tools

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
* required bump to make bundle work without conflicts

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
* make update-with-container - pull upstream manifests
* make update-bindata
* make bundle -- this now uses kustomize v5, to fix some conflicts

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
* make bundle

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
…degen.sh

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
* make update-with-container
* make update-bindata
* make bundle

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
- make bundle

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
@swghosh
Copy link
Member Author

swghosh commented Oct 18, 2023

/assign @thejasn
Ti's ready now, finally :)

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 18, 2023

@swghosh: This pull request references CM-190 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.15.0" version, but no target version was set.

In response to this:

[v1.13.0] Rebase Checklist:

  • go dependencies
go get github.com/cert-manager/cert-manager@v1.13.0
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@d34bd7aa15055b428bf865851bc420412f3710e6
go mod tidy
go mod vendor

go get github.com/openshift/api@release-4.13
go get github.com/openshift/library-go@release-4.13
go mod tidy
go mod vendor

go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go get sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go get sigs.k8s.io/controller-runtime@latest
go mod tidy
go mod vendor

go get sigs.k8s.io/kustomize/kustomize/v5@latest # required for fixing conflicts while running make bundle
go mod tidy
go mod vendor

go get github.com/cert-manager/cert-manager@v1.13.1
go mod edit -replace github.com/cert-manager/cert-manager=github.com/openshift/jetstack-cert-manager@v1.13.1
go mod tidy
go mod vendor

Signed-off-by: Swarup Ghosh swghosh@redhat.com

cert-manager changelog

TODO

Instructions 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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 18, 2023

@swghosh: all tests passed!

Full PR test history. Your PR dashboard.

Instructions 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.

@@ -0,0 +1,12 @@
apiVersion: v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whats the reason upstream for adding this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this is one of the new feature additions in cert-manager 1.13, cert-manager/cert-manager#5337 :)

cert-manager deployments would now rely upon a versioned config map implementation like revision controller in our library-go! 😮

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will open up the operand for customisation https://github.com/AcidLeroy/cert-manager/blob/282a6d58a9038a9b54149b8f67fdc1a1a12560cc/deploy/charts/cert-manager/values.yaml#L122-L142 (which we don't want). Since we are ensuring CM exists via the static resource controller, I'm not sure if it also forces the CM to always be empty (hoping it does), Can you verify this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our staticresourcecontroller doesn't update the resource, just creation and deletion based upon specific conditions. I can confirm this because I remember that in the past we used a method of adding annotations on a service account added by staticresourcecontroller and there was noticeably no reconciles to undo them. Going through implementation suggests likewise: https://github.com/openshift/library-go/blob/master/pkg/operator/staticresourcecontroller/static_resource_controller.go

However, IMO the user changing this config map manually would open the operand for customization and we don't have a good way to restrict that yet in our current changes.

@thejasn
Copy link
Contributor

thejasn commented Oct 19, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: swghosh, thejasn

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2023
@openshift-ci openshift-ci bot merged commit 6746376 into openshift:master Oct 19, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. docs-approved Signifies that Docs has signed off on this PR jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants