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

Release cert manager 1.14 #105

Merged
merged 13 commits into from
Feb 14, 2024

Conversation

@jetstack-bot jetstack-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. labels Feb 7, 2024
@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from wallrj. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@jetstack-bot jetstack-bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Feb 7, 2024
@wallrj wallrj force-pushed the release-cert-manager-1.14.1 branch 2 times, most recently from 93f8f00 to 850dbf7 Compare February 7, 2024 12:52
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
…he webhook

Signed-off-by: Richard Wall <richard.wall@venafi.com>
@wallrj wallrj force-pushed the release-cert-manager-1.14.1 branch from 850dbf7 to 2b98c7e Compare February 7, 2024 13:00
And explain why

Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
# repository. See:
# * https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/bundle-directory/managing-openshift-versions
# * https://redhat-openshift-ecosystem.github.io/community-operators-prod/packaging-required-criteria-ocp/#configure-the-openshift-distribution
# * https://github.com/redhat-openshift-ecosystem/operator-pipelines/pull/562
Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Compute the BUNDLE_CHANNELS and DEFAULT_CHANNEL variables.
And document each of the variables explaining which ones should and which should
not be modified by the release manager.
Explain the desired channel allocation behaviour.

Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
@wallrj wallrj changed the title WIP: Release cert manager 1.14.1 WIP: Release cert manager 1.14 Feb 14, 2024
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
#
# See README.md#Release Process for more details.
CERT_MANAGER_VERSION ?= 1.14.2
export BUNDLE_VERSION ?= $(CERT_MANAGER_VERSION)
Copy link
Member Author

Choose a reason for hiding this comment

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

I took the opportunity to improve the documentation of these variables and attempted to explain how they are intended to be used.

BUNDLE_CHANNELS := $(strip $(if $(subst ${CERT_MANAGER_VERSION},${empty},${BUNDLE_VERSION}),,stable) candidate)
# STABLE_CHANNEL is the default channel for the bundle. By default it will be the first of the BUNDLE_CHANNELS,
# so make sure that the `stable` channel appears first in that list if it is present.
STABLE_CHANNEL := $(firstword $(BUNDLE_CHANNELS))
Copy link
Member Author

Choose a reason for hiding this comment

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

These variables are once again computed. And I've documented the intended behaviour.
They were originally computed, but I had to override them for a release which went wrong and only now have I re-instated the original behaviour.

* (final release only )
* Remove the `-rc1` suffix from `BUNDLE_VERSION`
* Set `BUNDLE_CHANNELS ?= candidate stable`
Copy link
Member Author

Choose a reason for hiding this comment

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

The BUNDLE_CHANNELS variable is now computed based on the presence of a pre-release suffix on the BUNDLE_VERSION variable. So it's no longer necessary to edit this for each release.

"--tls-cert-file",
"--tls-private-key-file",
))
]
# Add the arguments back with the modified values
args.extend([
"--dynamic-serving-dns-names=cert-manager-webhook-service.$(POD_NAMESPACE).svc",
Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know why I left this particular argument in previous releases, but in 1.14 it is no longer allowed to mix the dynamic and the static certificate arguments, so I've removed it.

@wallrj wallrj changed the title WIP: Release cert manager 1.14 Release cert manager 1.14 Feb 14, 2024
@jetstack-bot jetstack-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 14, 2024
@wallrj wallrj merged commit 8d7ef81 into cert-manager:master Feb 14, 2024
3 of 4 checks passed
@wallrj wallrj deleted the release-cert-manager-1.14.1 branch February 14, 2024 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants