Skip to content

Commit d99fe14

Browse files
committed
Fix references to v1beta1 ingresses from webhooks config
1 parent 726f2f7 commit d99fe14

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

webhook/workspace/handler/kind.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var (
2424
AppsV1DeploymentKind = metav1.GroupVersionKind{Kind: "Deployment", Group: "apps", Version: "v1"}
2525
V1PodKind = metav1.GroupVersionKind{Kind: "Pod", Group: "", Version: "v1"}
2626
V1ServiceKind = metav1.GroupVersionKind{Kind: "Service", Group: "", Version: "v1"}
27-
V1beta1IngressKind = metav1.GroupVersionKind{Kind: "Ingress", Group: "extensions", Version: "v1beta1"}
27+
V1IngressKind = metav1.GroupVersionKind{Kind: "Ingress", Group: "networking.k8s.io", Version: "v1"}
2828
V1JobKind = metav1.GroupVersionKind{Kind: "Job", Group: "batch", Version: "v1"}
2929
V1RouteKind = metav1.GroupVersionKind{Kind: "Route", Group: "route.openshift.io", Version: "v1"}
3030
)

webhook/workspace/mutate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (m *ResourcesMutator) Handle(ctx context.Context, req admission.Request) ad
4545
return m.MutatePodOnCreate(ctx, req)
4646
case handler.AppsV1DeploymentKind:
4747
return m.MutateDeploymentOnCreate(ctx, req)
48-
case handler.V1ServiceKind, handler.V1beta1IngressKind, handler.V1RouteKind, handler.V1JobKind,
48+
case handler.V1ServiceKind, handler.V1IngressKind, handler.V1RouteKind, handler.V1JobKind,
4949
handler.V1alpha1ComponentKind, handler.V1alpha1DevWorkspaceRoutingKind:
5050

5151
return m.HandleRestrictedAccessCreate(ctx, req)
@@ -62,7 +62,7 @@ func (m *ResourcesMutator) Handle(ctx context.Context, req admission.Request) ad
6262
return m.MutatePodOnUpdate(ctx, req)
6363
case handler.AppsV1DeploymentKind:
6464
return m.MutateDeploymentOnUpdate(ctx, req)
65-
case handler.V1ServiceKind, handler.V1beta1IngressKind, handler.V1RouteKind, handler.V1JobKind,
65+
case handler.V1ServiceKind, handler.V1IngressKind, handler.V1RouteKind, handler.V1JobKind,
6666
handler.V1alpha1ComponentKind, handler.V1alpha1DevWorkspaceRoutingKind:
6767

6868
return m.HandleRestrictedAccessUpdate(ctx, req)

webhook/workspace/mutating_cfg.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ func BuildMutateWebhookCfg(namespace string) *admregv1.MutatingWebhookConfigurat
110110
{
111111
Operations: []admregv1.OperationType{admregv1.Create, admregv1.Update},
112112
Rule: admregv1.Rule{
113-
APIGroups: []string{"extensions"},
114-
APIVersions: []string{"v1beta1"},
113+
APIGroups: []string{"networking"},
114+
APIVersions: []string{"v1"},
115115
Resources: []string{"ingresses"},
116116
},
117117
},

0 commit comments

Comments
 (0)