Skip to content

CM-826: Rebase istio-csr with upstream v0.15.0 #363

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.

Sign up for GitHub

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

Merged
openshift-merge-bot merged 6 commits into from
Jan 8, 2026
Merged

CM-826: Rebase istio-csr with upstream v0.15.0 #363

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c38ff3
Update Makefile: ISTIO_CSR_VERSION
Jan 6, 2026
cb02ec7
Update CSV: OLM bundle name, version, replaces, skipRange and skips
Jan 6, 2026
ec159bf
More manual replacements
Jan 6, 2026
e132a87
Remove rebase automation script
Jan 6, 2026
ca3d048
Rebase and change istio csr version to 1.15.0
Jan 7, 2026
c7e603c
Bump up ISTIOCSR_OPERAND_IMAGE_VERSION
Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
BUNDLE_VERSION ?= 1.18.0
CERT_MANAGER_VERSION ?= "v1.18.3"
ISTIO_CSR_VERSION ?= "v0.14.2"
ISTIO_CSR_VERSION ?= "v0.15.0"

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
name: cert-manager-istio-csr
rules:
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
name: cert-manager-istio-csr
roleRef:
Expand Down
6 changes: 3 additions & 3 deletions bindata/istio-csr/cert-manager-istio-csr-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
spec:
replicas: 1
Expand All @@ -19,14 +19,14 @@ spec:
app: cert-manager-istio-csr
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
spec:
serviceAccountName: cert-manager-istio-csr
nodeSelector:
kubernetes.io/os: linux
containers:
- name: cert-manager-istio-csr
image: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
image: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
imagePullPolicy: IfNotPresent
ports:
- containerPort: 6443
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-leases-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
name: cert-manager-istio-csr-leases
namespace: istio-system
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-leases-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-metrics-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app: cert-manager-istio-csr-metrics
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
spec:
type: ClusterIP
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
name: cert-manager-istio-csr
namespace: istio-system
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app: cert-manager-istio-csr
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
spec:
type: ClusterIP
Expand Down
2 changes: 1 addition & 1 deletion bindata/istio-csr/cert-manager-istio-csr-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
name: cert-manager-istio-csr
namespace: cert-manager
2 changes: 1 addition & 1 deletion bindata/istio-csr/istiod-certificate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: cert-manager-istio-csr
app.kubernetes.io/instance: cert-manager-istio-csr
app.kubernetes.io/version: v0.14.2
app.kubernetes.io/version: v0.15.0
app.kubernetes.io/managed-by: cert-manager-operator
spec:
commonName: istiod.istio-system.svc
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/cert-manager-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ metadata:
features.operators.openshift.io/token-auth-aws: "true"
features.operators.openshift.io/token-auth-azure: "true"
features.operators.openshift.io/token-auth-gcp: "true"
olm.skipRange: '>=1.17.0 <1.18.0'
olm.skipRange: '>=1.18.0 <1.18.0'
Comment thread
arun717 marked this conversation as resolved.
Outdated
operator.openshift.io/uninstall-message: The cert-manager Operator for Red Hat
OpenShift will be removed from cert-manager-operator namespace. If your Operator
configured any off-cluster resources, these will continue to run and require
Expand Down Expand Up @@ -706,7 +706,7 @@ spec:
- name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER
value: quay.io/jetstack/cert-manager-acmesolver:v1.18.3
- name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR
Comment thread
arun717 marked this conversation as resolved.
value: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
value: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
- name: OPERAND_IMAGE_VERSION
value: 1.18.3
- name: ISTIOCSR_OPERAND_IMAGE_VERSION
Expand Down Expand Up @@ -822,7 +822,7 @@ spec:
name: cert-manager-controller
- image: quay.io/jetstack/cert-manager-acmesolver:v1.18.3
name: cert-manager-acmesolver
- image: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
- image: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
name: cert-manager-istiocsr
replaces: cert-manager-operator.v1.17.0
replaces: cert-manager-operator.v1.18.0
Comment thread
arun717 marked this conversation as resolved.
version: 1.18.0
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ spec:
- name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER
value: quay.io/jetstack/cert-manager-acmesolver:v1.18.3
- name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR
value: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
Comment thread
arun717 marked this conversation as resolved.
value: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
- name: OPERAND_IMAGE_VERSION
value: 1.18.3
- name: ISTIOCSR_OPERAND_IMAGE_VERSION
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/bases/cert-manager-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
features.operators.openshift.io/token-auth-aws: "true"
features.operators.openshift.io/token-auth-azure: "true"
features.operators.openshift.io/token-auth-gcp: "true"
olm.skipRange: '>=1.17.0 <1.18.0'
olm.skipRange: '>=1.18.0 <1.18.0'
Comment thread
arun717 marked this conversation as resolved.
Outdated
Comment thread
arun717 marked this conversation as resolved.
Outdated
operator.openshift.io/uninstall-message: The cert-manager Operator for Red Hat
OpenShift will be removed from cert-manager-operator namespace. If your Operator
configured any off-cluster resources, these will continue to run and require
Expand Down Expand Up @@ -149,5 +149,5 @@ spec:
minKubeVersion: 1.27.0
provider:
name: Red Hat
replaces: cert-manager-operator.v1.17.0
replaces: cert-manager-operator.v1.18.0
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
arun717 marked this conversation as resolved.
version: 1.18.0
26 changes: 13 additions & 13 deletions pkg/operator/assets/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.