Skip to content

Commit dd3f459

Browse files
Dipta Dastamalsaha
Dipta Das
authored and
tamalsaha
committed
Rename admission webhooks to avoid name collision (#725)
fixes #723
1 parent a32ceff commit dd3f459

16 files changed

+69
-45
lines changed

‎chart/stash/templates/mutating-webhook.yaml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ webhooks:
1717
service:
1818
namespace: default
1919
name: kubernetes
20-
path: /apis/admission.stash.appscode.com/v1alpha1/deployments
20+
path: /apis/admission.stash.appscode.com/v1alpha1/deploymentmutators
2121
caBundle: {{ b64enc .Values.apiserver.ca }}
2222
rules:
2323
- operations:
@@ -39,7 +39,7 @@ webhooks:
3939
service:
4040
namespace: default
4141
name: kubernetes
42-
path: /apis/admission.stash.appscode.com/v1alpha1/daemonsets
42+
path: /apis/admission.stash.appscode.com/v1alpha1/daemonsetmutators
4343
caBundle: {{ b64enc .Values.apiserver.ca }}
4444
rules:
4545
- operations:
@@ -61,7 +61,7 @@ webhooks:
6161
service:
6262
namespace: default
6363
name: kubernetes
64-
path: /apis/admission.stash.appscode.com/v1alpha1/statefulsets
64+
path: /apis/admission.stash.appscode.com/v1alpha1/statefulsetmutators
6565
caBundle: {{ b64enc .Values.apiserver.ca }}
6666
rules:
6767
- operations:
@@ -81,7 +81,7 @@ webhooks:
8181
service:
8282
namespace: default
8383
name: kubernetes
84-
path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollers
84+
path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollermutators
8585
caBundle: {{ b64enc .Values.apiserver.ca }}
8686
rules:
8787
- operations:
@@ -102,7 +102,7 @@ webhooks:
102102
service:
103103
namespace: default
104104
name: kubernetes
105-
path: /apis/admission.stash.appscode.com/v1alpha1/replicasets
105+
path: /apis/admission.stash.appscode.com/v1alpha1/replicasetmutators
106106
caBundle: {{ b64enc .Values.apiserver.ca }}
107107
rules:
108108
- operations:
@@ -140,4 +140,25 @@ webhooks:
140140
{{- if and (ge $major 1) (ge $minor 12) }}
141141
sideEffects: None
142142
{{- end }}
143+
- name: deploymentconfig.admission.stash.appscode.com
144+
clientConfig:
145+
service:
146+
namespace: default
147+
name: kubernetes
148+
path: /apis/admission.stash.appscode.com/v1alpha1/deploymentconfigmutators
149+
caBundle: {{ b64enc .Values.apiserver.ca }}
150+
rules:
151+
- operations:
152+
- CREATE
153+
- UPDATE
154+
apiGroups:
155+
- apps.openshift.io
156+
apiVersions:
157+
- "*"
158+
resources:
159+
- deploymentconfigs
160+
failurePolicy: Ignore
161+
{{- if and (ge $major 1) (ge $minor 12) }}
162+
sideEffects: None
163+
{{- end }}
143164
{{ end }}

‎chart/stash/templates/validating-webhook.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ webhooks:
1717
service:
1818
namespace: default
1919
name: kubernetes
20-
path: /apis/admission.stash.appscode.com/v1alpha1/restics
20+
path: /apis/admission.stash.appscode.com/v1alpha1/resticvalidators
2121
caBundle: {{ b64enc .Values.apiserver.ca }}
2222
rules:
2323
- operations:
@@ -38,7 +38,7 @@ webhooks:
3838
service:
3939
namespace: default
4040
name: kubernetes
41-
path: /apis/admission.stash.appscode.com/v1alpha1/recoveries
41+
path: /apis/admission.stash.appscode.com/v1alpha1/recoveryvalidators
4242
caBundle: {{ b64enc .Values.apiserver.ca }}
4343
rules:
4444
- operations:
@@ -59,7 +59,7 @@ webhooks:
5959
service:
6060
namespace: default
6161
name: kubernetes
62-
path: /apis/admission.stash.appscode.com/v1alpha1/repositories
62+
path: /apis/admission.stash.appscode.com/v1alpha1/repositoryvalidators
6363
caBundle: {{ b64enc .Values.apiserver.ca }}
6464
rules:
6565
- operations:

‎hack/deploy/mutating-webhook.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ webhooks:
1010
service:
1111
namespace: default
1212
name: kubernetes
13-
path: /apis/admission.stash.appscode.com/v1alpha1/deployments
13+
path: /apis/admission.stash.appscode.com/v1alpha1/deploymentmutators
1414
caBundle: ${KUBE_CA}
1515
rules:
1616
- operations:
@@ -30,7 +30,7 @@ webhooks:
3030
service:
3131
namespace: default
3232
name: kubernetes
33-
path: /apis/admission.stash.appscode.com/v1alpha1/daemonsets
33+
path: /apis/admission.stash.appscode.com/v1alpha1/daemonsetmutators
3434
caBundle: ${KUBE_CA}
3535
rules:
3636
- operations:
@@ -50,7 +50,7 @@ webhooks:
5050
service:
5151
namespace: default
5252
name: kubernetes
53-
path: /apis/admission.stash.appscode.com/v1alpha1/statefulsets
53+
path: /apis/admission.stash.appscode.com/v1alpha1/statefulsetmutators
5454
caBundle: ${KUBE_CA}
5555
rules:
5656
- operations:
@@ -68,7 +68,7 @@ webhooks:
6868
service:
6969
namespace: default
7070
name: kubernetes
71-
path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollers
71+
path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollermutators
7272
caBundle: ${KUBE_CA}
7373
rules:
7474
- operations:
@@ -87,7 +87,7 @@ webhooks:
8787
service:
8888
namespace: default
8989
name: kubernetes
90-
path: /apis/admission.stash.appscode.com/v1alpha1/replicasets
90+
path: /apis/admission.stash.appscode.com/v1alpha1/replicasetmutators
9191
caBundle: ${KUBE_CA}
9292
rules:
9393
- operations:
@@ -107,7 +107,7 @@ webhooks:
107107
service:
108108
namespace: default
109109
name: kubernetes
110-
path: /apis/admission.stash.appscode.com/v1alpha1/deploymentconfigs
110+
path: /apis/admission.stash.appscode.com/v1alpha1/deploymentconfigmutators
111111
caBundle: ${KUBE_CA}
112112
rules:
113113
- operations:

‎hack/deploy/validating-webhook.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ webhooks:
1010
service:
1111
namespace: default
1212
name: kubernetes
13-
path: /apis/admission.stash.appscode.com/v1alpha1/restics
13+
path: /apis/admission.stash.appscode.com/v1alpha1/resticvalidators
1414
caBundle: ${KUBE_CA}
1515
rules:
1616
- operations:
@@ -29,7 +29,7 @@ webhooks:
2929
service:
3030
namespace: default
3131
name: kubernetes
32-
path: /apis/admission.stash.appscode.com/v1alpha1/recoveries
32+
path: /apis/admission.stash.appscode.com/v1alpha1/recoveryvalidators
3333
caBundle: ${KUBE_CA}
3434
rules:
3535
- operations:
@@ -48,7 +48,7 @@ webhooks:
4848
service:
4949
namespace: default
5050
name: kubernetes
51-
path: /apis/admission.stash.appscode.com/v1alpha1/repositories
51+
path: /apis/admission.stash.appscode.com/v1alpha1/repositoryvalidators
5252
caBundle: ${KUBE_CA}
5353
rules:
5454
- operations:

‎pkg/cmds/root.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"k8s.io/kubernetes/pkg/api/legacyscheme"
1717
"kmodules.xyz/client-go/logs"
1818
"kmodules.xyz/client-go/tools/cli"
19+
ocscheme "kmodules.xyz/openshift/client/clientset/versioned/scheme"
1920
)
2021

2122
func NewRootCmd() *cobra.Command {
@@ -30,6 +31,8 @@ func NewRootCmd() *cobra.Command {
3031

3132
scheme.AddToScheme(clientsetscheme.Scheme)
3233
scheme.AddToScheme(legacyscheme.Scheme)
34+
ocscheme.AddToScheme(clientsetscheme.Scheme)
35+
ocscheme.AddToScheme(legacyscheme.Scheme)
3336
cli.LoggerOptions = golog.ParseFlags(c.Flags())
3437
},
3538
}

‎pkg/controller/backup_session.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func (c *StashController) NewBackupSessionWebhook() hooks.AdmissionHook {
3939
schema.GroupVersionResource{
4040
Group: "admission.stash.appscode.com",
4141
Version: "v1beta1",
42-
Resource: api_v1beta1.ResourcePluralBackupSession,
42+
Resource: "backupsessionvalidators",
4343
},
44-
api_v1beta1.ResourceSingularBackupSession,
44+
"backupsessionvalidator",
4545
[]string{stash.GroupName},
4646
api.SchemeGroupVersion.WithKind(api_v1beta1.ResourceKindBackupSession),
4747
nil,

‎pkg/controller/daemonsets.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func (c *StashController) NewDaemonSetWebhook() hooks.AdmissionHook {
2323
schema.GroupVersionResource{
2424
Group: "admission.stash.appscode.com",
2525
Version: "v1alpha1",
26-
Resource: "daemonsets",
26+
Resource: "daemonsetmutators",
2727
},
28-
"daemonset",
29-
"DaemonSet",
28+
"daemonsetmutator",
29+
"DaemonSetMutator",
3030
nil,
3131
&admission.ResourceHandlerFuncs{
3232
CreateFunc: func(obj runtime.Object) (runtime.Object, error) {

‎pkg/controller/deployment.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func (c *StashController) NewDeploymentWebhook() hooks.AdmissionHook {
2323
schema.GroupVersionResource{
2424
Group: "admission.stash.appscode.com",
2525
Version: "v1alpha1",
26-
Resource: "deployments",
26+
Resource: "deploymentmutators",
2727
},
28-
"deployment",
29-
"Deployment",
28+
"deploymentmutator",
29+
"DeploymentMutator",
3030
nil,
3131
&admission.ResourceHandlerFuncs{
3232
CreateFunc: func(obj runtime.Object) (runtime.Object, error) {

‎pkg/controller/deploymentconfiguration.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ func (c *StashController) NewDeploymentConfigWebhook() hooks.AdmissionHook {
2525
schema.GroupVersionResource{
2626
Group: "admission.stash.appscode.com",
2727
Version: "v1alpha1",
28-
Resource: "deploymentconfigs",
28+
Resource: "deploymentconfigmutators",
2929
},
30-
"deploymentconfig",
31-
apis.KindDeploymentConfig,
30+
"deploymentconfigmutator",
31+
"DeploymentConfigMutator",
3232
nil,
3333
&admission.ResourceHandlerFuncs{
3434
CreateFunc: func(obj runtime.Object) (runtime.Object, error) {

‎pkg/controller/rcs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func (c *StashController) NewReplicationControllerWebhook() hooks.AdmissionHook
2323
schema.GroupVersionResource{
2424
Group: "admission.stash.appscode.com",
2525
Version: "v1alpha1",
26-
Resource: "replicationcontrollers",
26+
Resource: "replicationcontrollermutators",
2727
},
28-
"replicationcontroller",
29-
"ReplicationController",
28+
"replicationcontrollermutator",
29+
"ReplicationControllerMutator",
3030
nil,
3131
&admission.ResourceHandlerFuncs{
3232
CreateFunc: func(obj runtime.Object) (runtime.Object, error) {

0 commit comments

Comments
 (0)