Skip to content

Commit d816cb4

Browse files
committed
(fix) Admission Webhook names must be unique
Problem: OLM currently creates all ValidatingWebhookConfigurations and MutatingWebhookConfigurations using the name provided in the WebhookDescription. This causes an issue when an operator that defines an admission webhook in the CSV is installed in multiple namespaces, causes the two operators to fight over the admission webhook. Solution: Generate a unique name for each webhook using the GenerateName field in the Object Metadata.
1 parent a947685 commit d816cb4

38 files changed

+12727
-12060
lines changed

deploy/chart/crds/0000_50_olm_00-catalogsources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: catalogsources.operators.coreos.com
88
spec:

deploy/chart/crds/0000_50_olm_00-clusterserviceversions.yaml

Lines changed: 37 additions & 64 deletions
Large diffs are not rendered by default.

deploy/chart/crds/0000_50_olm_00-installplans.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: installplans.operators.coreos.com
88
spec:

deploy/chart/crds/0000_50_olm_00-operatorgroups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: operatorgroups.operators.coreos.com
88
spec:

deploy/chart/crds/0000_50_olm_00-subscriptions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: subscriptions.operators.coreos.com
88
spec:

deploy/ocp/manifests/latest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
./0.14.1
1+
./0.14.2

deploy/ocp/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ writePackageServerStatusName: operator-lifecycle-manager-packageserver
1010
olm:
1111
replicaCount: 1
1212
image:
13-
ref: quay.io/operator-framework/olm@sha256:0d15ffb5d10a176ef6e831d7865f98d51255ea5b0d16403618c94a004d049373
13+
ref: quay.io/operator-framework/olm@sha256:f6ce23402d5309872855a47116ada409155b15d3ef7f74940eb1bdca6ebbded3
1414
pullPolicy: IfNotPresent
1515
service:
1616
internalPort: 8080
@@ -38,7 +38,7 @@ olm:
3838
catalog:
3939
replicaCount: 1
4040
image:
41-
ref: quay.io/operator-framework/olm@sha256:0d15ffb5d10a176ef6e831d7865f98d51255ea5b0d16403618c94a004d049373
41+
ref: quay.io/operator-framework/olm@sha256:f6ce23402d5309872855a47116ada409155b15d3ef7f74940eb1bdca6ebbded3
4242
pullPolicy: IfNotPresent
4343
service:
4444
internalPort: 8080
@@ -64,7 +64,7 @@ catalog:
6464
package:
6565
replicaCount: 2
6666
image:
67-
ref: quay.io/operator-framework/olm@sha256:0d15ffb5d10a176ef6e831d7865f98d51255ea5b0d16403618c94a004d049373
67+
ref: quay.io/operator-framework/olm@sha256:f6ce23402d5309872855a47116ada409155b15d3ef7f74940eb1bdca6ebbded3
6868
pullPolicy: IfNotPresent
6969
service:
7070
internalPort: 5443

deploy/upstream/manifests/latest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
./0.14.1
1+
./0.14.2

0 commit comments

Comments
 (0)