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

Clean-up deprecated network policy annotations and kube-apiserver webhook #18

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ metadata:
networking.resources.gardener.cloud/from-all-seed-scrape-targets-allowed-ports: '[{"port":{{ .Values.controllers.metricsPort }},"protocol":"TCP"}]'
networking.resources.gardener.cloud/namespace-selectors: '[{"matchLabels":{"kubernetes.io/metadata.name":"garden"}}]'
networking.resources.gardener.cloud/pod-label-selector-namespace-alias: extensions
# TODO: This annotation approach is deprecated and no longer needed in the future. Remove them as soon as gardener/[email protected] has been released.
networking.resources.gardener.cloud/from-policy-pod-label-selector: all-seed-scrape-targets
networking.resources.gardener.cloud/from-policy-allowed-ports: '[{"port":{{ .Values.controllers.metricsPort }},"protocol":"TCP"}]'
labels:
app.kubernetes.io/name: gardener-extension-{{ .Values.serviceName }}
app.kubernetes.io/instance: {{ .Release.Name }}
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: shoot-lakom-service
type: helm
providerConfig:
chart: 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
chart: H4sIAAAAAAAAA+09a3PbuLX7mb8CZdrpJrOk3vZWM+nUsbVZzya2xnZzb6fTyUAkLKEmCRYg5WiTvb/9HgAkxZcelB3Z6erMjpcC8TgAzhsHzBRzlwSEW+RTRAJBWWCJGWOR5eE75luC8Dl1SOu7h0Ab4HgwUP8HKP9fPXd6/U530D06kuWd425/8B0aPGjULSEWEeYIfcdh0uvqbXr/jcJ0u/23Z8Tz6TRgnDQfQ27wUb+/cv9h24v73+30293vUPvxp1uF3/n+v0BjHEWEBwJFDOkdRvczEqBJTD2XBlMUYucOT4mwjRfoZkYFEnEYMh7BA1CFh6YemyAfR84Mav+AOPFwROcE2kWzXDkOXOggIFN4ywL0fcjJLf1EXHRPod4fXtroMvAWiAWqpUQJhYQjjwbENuyz64/XEeAGXZwy34cOPpxeI5dyYdhTGrXUX42+YU9+5S31Ny2YTVvyT/pTzIPWsqMJzC8O0S31iDBe2eI+hL8TfAd/Ix+e/w+qfsCcslig87MRDBhy9m/iRIZNXYJbuh4UGfZcOMwlLeOpd3V72JL/T2eYR/YC+94OY2zi/+6gX+b/znHvwP/7ABzSD4TLfR+iecfAYZj9NDt22zRcIhxOw0gVnaCfQQ8gR1IDumUcRTOC3iYkhN5JkkHXmmTQKCUoVfFaEhWIkAD7ZIi2ozpjnqLStgGXb4irvh3Ykv9d5thTtuMYm/j/uDso8X+7J+2/A/9/fWi10PX47H+tn0D7nbJwASpzFt0AMQxRt93touuTMboeIeBgHKgf+BYUJcURQQ7zQxwspGJfygCHBRGnkxh0tTBaLSPt/x1QUSCIdQ7VInpLCQdpApbFjFhdYG2oN2XDqexCdi1myHKQadst+G9OApfxFuj3WTyxYdRWSrTLhxno8Fba3FJIMM8DsuZkSkXElc1hQ7c1xI1s9MfvHRwhPdyH0dX1+eXFy+Qn+YT90COtVX1KnbiUdcOa/k05OzCzlBWVyE4S4AmYG6gwaW1WKXGZFErzS4pYh3EOBgdaIoEKSBhhvvcmgnJL/o8ILAIgKXbxBBv7f91Ot987+H/7gMb7/xFsfrDLhR2F29qCm/2/Xmn/e4Ojg/zfC3z+bCHkgicGbpdJfZAhJrJ++81ASL6ht2iGxVh5asgUM9wdHA1NZH/AXgwOoapvR3iKshYhp0F0i8w/ib/9SZRrchIyQUE1LNZ1QTxB6joc7twhKCj4kXtUz+msPYJdAl4rCFggf+rqBVjLD5ZuY6WNsr5ly6fe0kbQnP8To7yBANjo/x2V/b/e8fGB//cCeUYImetSwWPl7E1id0qiZLM1SyQSQRAfik+l9ceh1V9fo47d7VhtYM5THOIJmIcRBU78JZ6QxJm039IoeVQ9hcyjzqIFDmfG8IXiCYlwp8BU3yyDPXNozP+OBxxDODgB8FdYHptOwUpdGxra6P/1y/7f0VHvEP/ZC7z4iu7fC+PFds6fZVlGPhB1C5o8iCY0svWTTRkIBeyFYIAYdzRwh+hUk+FPigwNH+SFiyM8BI3v4QkIFPmEch1lnmK0CMkQbBlCXBPq6HjUBmUvfxkiJI7sNaF8+QjWCeZQSw+G0B1ZXKj+gCuSoqTCNiNYum7SkBP5kpzJWaGIxwTKVTB9iO5AsPKAADfar9b2+0r9erVOYO7K/xrXx+H/Qee4yv/HB/7fB3zj/D/WLJPn/605eslvTURGKgb+LQBT1SKiPvmFLIBLxbdnmjTnfxbc0qmPw1wLXbZSBmzgf2D9cvzn+BD/3RM8S/4HvyDhckVY73HYlMNtTZJJZQFjQYvPn5F9BS47FsS+SItlOCDtOEfHQ/RFMXceLTWCnY0rkkEyQWE7HovdVFJ1VPv8PGIdrVXlDhN0GozjCXg8IDxA+AB2EfuHjCanoYxltFc+F+ujLwh6huVERzrQAZILUy/mZKycKD3bmo4KtdKmLpnEU41kasvoCPWYM7nfwXRlf7mmdqkN4AiuJY69CHDLgjrLzqFVJAmCBbsMU9O6ZsCn5q/nDg+Q/yrSNicO8LrF5oTfcxqROiWwSf63j7pF+d9r97vtg/zfBzwb+Z8Elwph3A+KuC5T2pLyo7GaqCHwnIhJ6FtqA+i9nqS3VCJFMxKHoZ3z08CAbY7Oio5oACQb1OGS12VqKuJjkTGlVqvqmdq1zvRLvxQ7f2qKPcBjQmP575LQYwtfemXbpoOtl/+dbq9Ttv/7oAEO8n8f8Gzkf16wg8wTrUy6n2UU90DxvqUgL2silTR6RQSLuUOE7gcHAYuUNZ/Ie56+L3sDuvkQmTKGZ+YF6VdSGDJT2xazlkoF2YPCUWMC2Vh4Dq6FPv5ZpCGBlcuiYyoqxMmzmAoncyox/JkKeab7jvoUZjBQb0LwV7Ao+AdJ4SmLQU0pTIQ6kGVJQFaFS9/l1vgRV3mXdUqFaIJdjpZVf2WSUuFjzqDejMQ5XCudf0H/iVmUQ63cTqYVrfSsoB6njhjL1KONPQmH43BJzWkl4GTnTsT+muiQGp8Gjhe7RCZ/U9izP9o3yZLYb2A2Y5kwbm6KMJkvkQ2I6mQEGHOJ7JYm5FZI11qCu8xhtZe0fiKZkJDgFYj4Ucl4N4aXANXvGb+T0f8yczOLA09Sn1gg1jWTg1T3PHZP3O3au8AFzVqEKjZiJXWatp54zLkjruVQl5faptIpR2LTCH0vN79OEr1EnZyQAHUZgDzMcTRzT2BpTiovpJD7T0w5cc9ioKzpNdCnG8uwxrlSIUnx6BNxYpWNnWtpaQq5Loi/JShBOPoUgjQWRfmSNr+T8et6qirVRYiFMjURRkHnQeXlXC1IeQA5xE60uQG/lFAfC8d15C4hYiHz2HShwv1mEZcZE5FcL3MVE4O8YMD8i1MPC3FR5FexEKAdrL+020nlZD1OHEfS1MWu3C2AWNSYMlgGVl02G+DPE3HBgiswa7PzRQ2K9seczsEmnJKRcLCHdfq/Cqpl9aBvaQPq6BvJL6dW7ldaBJzpiFzyWmoeTIPkAFWv+gNkl5KuBbGcJrHZlWrj2PNqgqM6YSzMXhZUBPN9sG+Xc7NQazuPKdfCSrTX6xaJnFbRr8rptUILj94SZ+F4xPLxJ9ketpGDBWxxIn/Iq0qvV+jzrKm9bHa9CByRn5gcY0awF82UFmw+Sq7xpnG0BWxplpTLtbR0VvWum1ymLU6yBuW+S3l4FnVf52mhmtpn16wCjyYER1bmG7xeE+OpawgzJ/cW6APYVOzB3sJU3HUrp9vZqt150uxatyqPck8mQFx3CQlZDuGR5VL+uhX5YR0prmSZlmwq1vWt9bQljcVVuOsqylSsJSZrAh6bhV1XaprXw7W0U9dLYotu103ecM3149E5rIkQIJcmBak0i6LwLYmKcl9eUhyilkbp1+KrdVZz/RwkCGAKKc9+vrkZ515IbU+xd0Y8vEj2eog67aVABlKljfGWrRZ7R3uQVSDBPC8ctSR/Nzo5G119HL0bnd6cX158vDh5P7oen5yOcv0qHfwT+BbFad1S4rlX5LasnFX5WM059ZvsjF+zug0dgBTf8/cnb0cfANnLq4+XH0ZX/3N1flPBFRZbedS5kGqrNsZawKZgAFQQ5MWgQkoISWHdkeCyxRdQ2tRfhmk77fJApbHnzIt98l6aE6K6Z8X8iOz0NAVfNtPrX9ViBRMWu/Iab8mk2HFjNrhjK/CrbNN2+BWWSy9WxUZZu0pOegqRJ95GZ9UpANJ+yT5NTOA6e0GDFgjV942WvunCr5nyo5y7pJCc6r5nLvTc77ZzczucSjwIGsf/a5LENx0EbDr/7RxX8v+6h/zf/cCzjP/nTfh1lxJsYHx9RjBm7llW642qtZ/Dgmdy6pvGqMCP+3uQBOLBJ0edZx4Uf2ry/91DY/nPJ9hp+CGQDfK/36+c//bavUP+517gWcj/F+jm8uzy+3kYyLL5yyG6Ij7YgSgOAkJc4sovAflUB68RA2mS3IrPbsNToUz7RVWXKHrFcTRjnP6qb8vf/Sh0Rnkxl/yKeWRdnmn5DHO4Thg+C63AY0/6MJbMYn3LWRwmt1bk+bpR8DRl6TKzQ74EJTtJXkhlqs4YqNAP91KHVLtduVLVsZJbJDsOtOpUuTqOjwPwLNystDie+cqsdm6a1W4yS+Drr8yyaulnC3Y6irdDQF9NSp/iECiabDfT7OBSDy+Iw0mUoDKvkkbtCjqMcZcGeWarDqQotdQbjIWV37d5RZuNkZYr002/2ypMXHtqlQVwi8gnq5zuSpXp3ESCFb7csQp1P47U5z+SGK2TTyDX2zHHHnXX1qlf2W1pdv/41uxSoyiCvKCzck+W7ODCRkt2eJCieAMFMJX/Mn0BE0uCrykxrFkXI7vdkNOfD1kFEU/kZ/WUxtI9XxdOQb+mH/fUdthTQWP7Pw1aNnABNtj/3W6n/P3P3uD4kP+/F1hr//ee+v5Xwv8PTetPFMN28ZxKHl4ub2hlOuMtB2aBWp5ryVQk+XXUIfrzPz+bIWcRc5hnDs2b07H5gynfmauONAvnq7/968/Nxseep6Zq6Sw9CwgblL2wkmSmAlrrsCgerP5QnkMTvLIlt9IoVIJALgwFeJRSaQpHfDCq7tRstCIhcy2lVLORlwf8sCJU5pIWbO1noYHTOJ7OoEkU6/m4EsV7MgT1+XL69QN11Nzv91RXKZkMEVCJKtEEOF53IF3MKHhqafj7g131P9Ym2VZmwKbvPxwdl7//MugMDvc/9gLPIv63Sf+n9v/v6UQHPC6mshqKa3DD7kiWifkI+9+Y/+chbvod8E3nv9Xvv3SPu50D/+8Dng3/l/JUJJnpe/5u6davKTlDJiVL8y+L0JiJxIBqEYWXY+aeJPVqvw/zFQRHarvVzCS1UvMZxsUyLW2y7GhVSNMEJGv5YudMcJ8GJ9oPWObq+MRnXGdDp3cPkLkab3vZh62b6nMX3dJcM+OaluWvc6bWYpb8V3chUJZXLgXulnMEzXR0ML/+ukSnGeVaygnlK9vLet/65egt5b++MrHjPwCxOf5Tlv+dfu/w77/sBZ6F/M9x5rDuC+1G/n7VEPUMQ9/7kN5o7lLH+e0Fi8byw3lKKkR4KjM2wWiJlLhNPxUMfn9sTx0uFUdG/sk/6bL8onz+4K0GI6MukRKEhpQrL5KPLwzVcyl7NCkrInTLmD3BvHb0Yis1qXnH7to9o3QzObUKjcLRjBTPsAKJJnHCeIgGbd/Ii/9O98f31AAhJ+skSjdLkK1TU1VdknZ11IeeNklWU2pm0zBycQD1xYpVlz6WF4+yuy2ZusxfPJE0a8gL0NnVlA3V9DFeeoG7ehkDSE3WrHyrCf3zX6rNC9jaL8kTbLOEN6O35xdo/Pc3785P0S+jf6jCrEqn2+sX648uzlbUbtg1njjuNl2XvhL1E/w0EFqGYeSlhO5guY667Mf2j7IoFxlUZVIjV74dVfly1PLa2JrvPj2aR3OAAxzgAAc4wAEOcIB18P8v3tDzAHgAAA==
values:
image:
tag: v0.8.0-dev
Expand Down
2 changes: 0 additions & 2 deletions pkg/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,4 @@ const (
LakomResolveTagPath = "/" + ApplicationName + "/resolve-tag-to-digest"
// LakomVerifyCosignSignaturePath is the URL path to the hook verifying the cosign signature of the image.
LakomVerifyCosignSignaturePath = "/" + ApplicationName + "/verify-cosign-signature"
// LakomMutateKubeAPIServer is the URL path to the hook mutating the kube-apiserver deployment
LakomMutateKubeAPIServer = "/" + ApplicationName + "/mutate-kube-apiserver"
)
3 changes: 0 additions & 3 deletions pkg/controller/lifecycle/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,6 @@ func getSeedResources(lakomReplicas *int32, namespace, genericKubeconfigName, sh
Annotations: map[string]string{
"networking.resources.gardener.cloud/from-all-scrape-targets-allowed-ports": `[{"protocol":"TCP","port":` + metricsPort.String() + `}]`,
"networking.resources.gardener.cloud/from-all-webhook-targets-allowed-ports": `[{"protocol":"TCP","port":` + serverPort.String() + `}]`,
// TODO: This annotation approach is deprecated and no longer needed in the future. Remove them as soon as gardener/[email protected] has been released.
"networking.resources.gardener.cloud/from-policy-allowed-ports": `[{"protocol":"TCP","port":` + metricsPort.String() + `}]`,
"networking.resources.gardener.cloud/from-policy-pod-label-selector": "all-scrape-targets",
},
},
Spec: corev1.ServiceSpec{
Expand Down
2 changes: 0 additions & 2 deletions pkg/controller/lifecycle/actuator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,6 @@ metadata:
annotations:
networking.resources.gardener.cloud/from-all-scrape-targets-allowed-ports: '[{"protocol":"TCP","port":8080}]'
networking.resources.gardener.cloud/from-all-webhook-targets-allowed-ports: '[{"protocol":"TCP","port":10250}]'
networking.resources.gardener.cloud/from-policy-allowed-ports: '[{"protocol":"TCP","port":8080}]'
networking.resources.gardener.cloud/from-policy-pod-label-selector: all-scrape-targets
creationTimestamp: null
labels:
app.kubernetes.io/name: lakom
Expand Down
7 changes: 0 additions & 7 deletions pkg/controller/webhook/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ import (
"github.com/gardener/gardener-extension-shoot-lakom-service/pkg/lakom/verifysignature"

"github.com/gardener/gardener/pkg/controllerutils/routes"
appsv1 "k8s.io/api/apps/v1"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
webhookadmission "sigs.k8s.io/controller-runtime/pkg/webhook/admission"
)

const (
Expand Down Expand Up @@ -100,11 +98,6 @@ func AddToManagerWithDefaultConfig(ctx context.Context, mgr manager.Manager, con
&admission.Server{Webhook: crwebhook.Admission{Handler: cosignSignatureVerifyHandler}},
)

server.Register(
constants.LakomMutateKubeAPIServer,
webhookadmission.WithCustomDefaulter(&appsv1.Deployment{}, &kubeAPIServerMutator{}).WithRecoverPanic(true),
)

return nil
}

Expand Down
31 changes: 0 additions & 31 deletions pkg/controller/webhook/mutate_kube_apiserver.go

This file was deleted.

39 changes: 0 additions & 39 deletions pkg/controller/webhook/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/gardener/gardener/extensions/pkg/webhook"
v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
Expand Down Expand Up @@ -43,7 +42,6 @@ func GetWebhookConfigurations(mode, url, namespaceName, failurePolicyConfig stri
sideEffects = admissionregistrationv1.SideEffectClassNone
matchPolicy = admissionregistrationv1.Exact
failurePolicy = admissionregistrationv1.FailurePolicyType(failurePolicyConfig)
failurePolicyFail = admissionregistrationv1.Fail
namespaceSelector = metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Expand Down Expand Up @@ -115,43 +113,6 @@ func GetWebhookConfigurations(mode, url, namespaceName, failurePolicyConfig stri
MatchPolicy: &matchPolicy,
TimeoutSeconds: pointer.Int32(25),
},
// TODO: This webhook approach is deprecated and no longer needed in the future. Remove it as soon as gardener/[email protected] has been released.
{
Name: "mutate-kube-apiserver.lakom.seed.service.extensions.gardener.cloud",
ClientConfig: webhook.BuildClientConfigFor(
constants.LakomMutateKubeAPIServer,
namespaceName,
Name,
443,
mode,
url,
nil,
),
AdmissionReviewVersions: []string{"v1", "v1beta1"},
Rules: []admissionregistrationv1.RuleWithOperations{{
Rule: admissionregistrationv1.Rule{
APIGroups: []string{appsv1.SchemeGroupVersion.Group},
APIVersions: []string{appsv1.SchemeGroupVersion.Version},
Resources: []string{"deployments"},
},
Operations: []admissionregistrationv1.OperationType{
admissionregistrationv1.Create,
admissionregistrationv1.Update,
},
}},
NamespaceSelector: &metav1.LabelSelector{MatchLabels: map[string]string{
v1beta1constants.GardenRole: v1beta1constants.GardenRoleShoot,
"extensions.gardener.cloud/" + constants.ExtensionType: "true",
}},
ObjectSelector: &metav1.LabelSelector{MatchLabels: map[string]string{
v1beta1constants.LabelApp: v1beta1constants.LabelKubernetes,
v1beta1constants.LabelRole: v1beta1constants.LabelAPIServer,
}},
SideEffects: &sideEffects,
FailurePolicy: &failurePolicyFail,
MatchPolicy: &matchPolicy,
TimeoutSeconds: pointer.Int32(10),
},
},
}

Expand Down