Merge pull request gardener#126 from gardener/rc

Vendor gardener/gardener@v1.8.0

.github/pull_request_template.md

@@ -7,7 +7,7 @@ If multiple identifiers make sense you can also state the commands multiple time
   /area auto-scaling
   ...
 
-"/area" identifiers:     audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|operations|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
+"/area" identifiers:     audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
 "/kind" identifiers:     api-change|bug|cleanup|discussion|enhancement|epic|impediment|poc|post-mortem|question|regression|task|technical-debt|test
 "/priority" identifiers: normal|critical|blocker
 

Makefile

@@ -25,8 +25,9 @@ VERIFY                      := true
 LEADER_ELECTION             := false
 IGNORE_OPERATION_ANNOTATION := true
 
+WEBHOOK_CONFIG_PORT	:= 8443
 WEBHOOK_CONFIG_MODE	:= url
-WEBHOOK_CONFIG_URL	:= docker.for.mac.localhost
+WEBHOOK_CONFIG_URL	:= host.docker.internal:$(WEBHOOK_CONFIG_PORT)
 EXTENSION_NAMESPACE	:=
 
 WEBHOOK_PARAM := --webhook-config-url=$(WEBHOOK_CONFIG_URL)
@@ -48,7 +49,7 @@ start:
 		--ignore-operation-annotation=$(IGNORE_OPERATION_ANNOTATION) \
 		--leader-election=$(LEADER_ELECTION) \
 		--webhook-config-server-host=0.0.0.0 \
-		--webhook-config-server-port=8443 \
+		--webhook-config-server-port=$(WEBHOOK_CONFIG_PORT) \
 		--webhook-config-mode=$(WEBHOOK_CONFIG_MODE) \
 		$(WEBHOOK_PARAM)
 

charts/gardener-extension-provider-alicloud/templates/deployment.yaml

@@ -43,6 +43,7 @@ spec:
         - --ignore-operation-annotation={{ .Values.controllers.ignoreOperationAnnotation }}
         - --worker-max-concurrent-reconciles={{ .Values.controllers.worker.concurrentSyncs }}
         - --webhook-config-namespace={{ .Release.Namespace }}
+        - --webhook-config-service-port={{ .Values.webhookConfig.servicePort }}
         - --webhook-config-server-port={{ .Values.webhookConfig.serverPort }}
         - --disable-controllers={{ .Values.disableControllers | join "," }}
         - --disable-webhooks={{ .Values.disableWebhooks | join "," }}

charts/gardener-extension-provider-alicloud/templates/service.yaml

@@ -14,6 +14,6 @@ spec:
   selector:
 {{ include "labels" . | indent 6 }}
   ports:
-  - port: 443
+  - port: {{ .Values.webhookConfig.servicePort }}
     protocol: TCP
     targetPort: {{ .Values.webhookConfig.serverPort }}

charts/gardener-extension-provider-alicloud/values.yaml

@@ -45,6 +45,7 @@ ignoreResources: false
 #   ...
 
 webhookConfig:
+  servicePort: 443
   serverPort: 10250
 
 config:

cmd/gardener-extension-provider-alicloud/app/app.go

@@ -29,12 +29,12 @@ import (
 	alicloudinfrastructure "github.com/gardener/gardener-extension-provider-alicloud/pkg/controller/infrastructure"
 	alicloudworker "github.com/gardener/gardener-extension-provider-alicloud/pkg/controller/worker"
 	alicloudcontrolplaneexposure "github.com/gardener/gardener-extension-provider-alicloud/pkg/webhook/controlplaneexposure"
+	genericcontrolplaneactuator "github.com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator"
 
 	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
 	"github.com/gardener/gardener/extensions/pkg/controller"
 	controllercmd "github.com/gardener/gardener/extensions/pkg/controller/cmd"
 	"github.com/gardener/gardener/extensions/pkg/controller/worker"
-	"github.com/gardener/gardener/extensions/pkg/controller/worker/genericactuator"
 	"github.com/gardener/gardener/extensions/pkg/util"
 	webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd"
 	machinev1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1"
@@ -175,19 +175,17 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			}
 			alicloudcontrolplane.DefaultAddOptions.ShootWebhooks = shootWebhooks
 
-			if err := controllerSwitches.Completed().AddToManager(mgr); err != nil {
-				controllercmd.LogErrAndExit(err, "Could not add controllers to manager")
-			}
-
-			// Cleanup leaked ClusterRoles from worker controller.
-			// See https://github.com/gardener-attic/gardener-extensions/pull/378/files and https://github.com/gardener/gardener/issues/2144.
-			// TODO: This code can be removed in a future version.
+			// Update shoot webhook configuration in case the webhook server port has changed.
 			c, err := client.New(restOpts.Completed().Config, client.Options{})
 			if err != nil {
-				controllercmd.LogErrAndExit(err, "Error creating client for orphaned ClusterRole cleanup")
+				controllercmd.LogErrAndExit(err, "Error creating client for startup tasks")
 			}
-			if err := genericactuator.CleanupLeakedClusterRoles(ctx, c, alicloud.Name); err != nil {
-				controllercmd.LogErrAndExit(err, "Error cleaning up leaked worker controller ClusterRoles")
+			if err := genericcontrolplaneactuator.ReconcileShootWebhooksForAllNamespaces(ctx, c, alicloud.Name, alicloud.Type, mgr.GetWebhookServer().Port, shootWebhooks); err != nil {
+				controllercmd.LogErrAndExit(err, "Error ensuring shoot webhooks in all namespaces")
+			}
+
+			if err := controllerSwitches.Completed().AddToManager(mgr); err != nil {
+				controllercmd.LogErrAndExit(err, "Could not add controllers to manager")
 			}
 
 			if err := mgr.Start(ctx.Done()); err != nil {

example/controller-registration.yaml

@@ -18,7 +18,7 @@ spec:
   deployment:
     type: helm
     providerConfig:
-      chart: H4sIAAAAAAAAA+0ca3PbNrKf9Ssw6nWm6YTUw7Lc001uTrHdVpPE9liuc73OjQciIYkxRTAAaUeX9r/f4kESpChRdBKnabnjGYsAdrEAdheLxZILzFwSEGaRdxEJuEcDK2T0znOhCPue49PY7Xz1YdAFODo8lP8Biv/l797BoNc/7A+Horw3PDoafoUOP7DfvSDmEWYIfcUojXa1q6r/QmGxz/ofLzGL7DVe+Q/qo2r9+4fD/Pr3u0cHva9Q9yOPtRT+4uuPQ++aMLHuI3TXa+EwNB7t3sDuWi65a7mEO8wLI1kxRj8Rf4UcIRVoThmKlgT9qAUJjbXUoAstRygVrVaAV2SE9pG51l0ZG597tv58sJf+u9SxF/TBfVTof7837Bf1vyvsf6P/nx46HXRMwzXzFssIfes8Qf1u7+9oOr5A01MEqo0D+YDnc8/3cESQQ1chDtY26LmPJBpHjHDC7ohro6ulxxE0JQj+g/iASBEXxYEwA8JKjEPswL8pnUf3mBH0UjV5iu5s1AdD4ZAwQpijgEaARwGF3XscqAUS/eXk+PQMGBM9tDod+EsolHSS0tYWDfXtLvpWNGjrqvaTfwgSaxqjFV6LTlEMnUXpIDRD0LsYNkxA4BB070VLxY2iYgsav2gadBZhaI4BIYSnudkQ4UgzLWEZReGo07m/v7ex5NimbNHRk8Y7eqwWcK2xfg58wsVsv409BiOerRHYa0DAM+DVx/dywRaMQF1EBdf3zIu8YPEUcT3hgozr8Yh5szjKTVrCIwzdbADTBiLQHk/RZNpGz8fTyfSpIPJ6cvXT+c9X6PX48nJ8djU5naLzS3R8fnYyuZqcn8HTD2h89gt6MTk7eYqIJ1YSpjNkYgTApiemEyRG0JoSkmMh2VJ4SBxv7jkwtGAR4wVBCwrbQgAjQiFhK4+LZeXAoCvI+N7Ki3AkizbGZbegyYKOFsLYCTm27Q783ZHApayzAP7imQ2L3EkMYvZjiZ3bToJnOTSIGPV9sI+MLMRMyS5tvkQbhhPZupvr08spzIp+Iu8wjJ50tpESjhZ6Dr3G4fPYuSXRKCWoSk8Bb50VHis6FzBNJCudBHOGgWbsRDEzyl9TdktY+izmBV0AWTG/aksngRAojszp4nEYUr3d60KxDGKGHcoYcSKUDQflhtMKTerNHv6Hgr32/4iAvIIU8IedBGuf/8D/Pxo057/HgJrrf7MkPphebkfh/mfBivXv9eGwl1//g4Ne4/89Crx/byGXzL0AvCJxOmsj6/ffW3ud0AQqbJ8SoWXS8fGM+BycmtC+JWtFUT7EM9i9CciR7dGO6C1HYwuJO+zHmq3378GpcfzYTZm1kUbcwcgmbpFBQWWEtrTQ/cueNkfhBSA/4BVKdPuS+ASDs3EGzJVylrLmrWBHVJwhJGq8OVpifsGg/h1q8yXuHw5H0O216B66Eu3tCC9QihEyL4jmqP0N/9c3vNiSkZByL6JsvYsEjJGUERw9mCAM1hh3cUFcEvp0vSJBpI/3qXDwzl0vN12fWzH+IlDT/oOPN/cWKxxacvHvwO+jzBJeuThqkPIYYdX+Pxge5O3/Qbc37Db2/zFAm56cSl/LVT1PFlUZvlyY8NYL3JE4d4AwvMJha0Ui7OIIj8AMqBhfuakulxqNxOGcUGJHZbGyMMoqj0psuSD/GxSCLEdoIFon7Mge+U1eREfoN0Fk56jz5AyL9rmX7KPCg/Xfp4sFnAD3uRWo8v8ODgr6Dz8O+43+PwZ8LMXW4mApAclrtJIxQ39F9CuVN24nMmgraVMkYhU9GCFNOVXouedHIJyGGyYQhEYLsr/+MHl5dXr53xbSIF2xAoSYccLSJq9w5CwLTQzy30m2zMDPCgdgMNh3iYJYW1ukfbwg65siKzCytP5CsrTJA6yPjK2yizzPlyrkenMCs5KUXbGYtD7ZLKywswQnbuc87Gjz+DPxuVXri4CH2v86t8FV9z9Hh0fF8/9w0Nz/Pgp8LPufCsYndeZUL6kLJ1Tdsiz53xxIIrh2Isq2sdtoGoVN566H/XCJe5JWOgvaiB2bO1Kr4DJreo7vAbvQMgA/Utw2yUECy4XykTZc2BFXS6IPqL5ah4TL2Uovd9oV9O1NAuLuJsFvV/FXhq9ZlvOclNbkysCsx46JmPLxNqw7K4BRr1+BkPY3ixmPavYocer1qVDyp4pyqdIb6kQcUM7vQVynxGEkSjjeUn1J5omYpUq7H2E70JGrDLtKkyvHcL+E45Tv8Yi4srvJSTrjJVWKcUGJ4WBBahCzJI9gOd7GNEoHUR6VEjUkctxkmjgc/YDaKPUqHB9zfrZl8gSmrVHstGU2bYAubnS9aF2NrRtunz7ZfCbv/VQjFNFfxA3hjnap9RxWnV1r7v9ZAK+GA1Cx/x/1+8X7n0F3MGj2/8eA3Lapw7Bq+ztJl3pvL2DPvV8Gws2g0yKgjIAfT2PmJNsQDgKqb/OVVrKkvrh1K/QRakfg9bfzWl7HyRDpBqIrRu48MSE/eUJJ1y9FWsEIdWWNzLbgOa3Whcc0DrRd5jBoEUsaaRsN56qX+/Ex1ATE1TlZrPXAwQeBA/DPISxBaqFW+N3PAb7Dni/u6nMM5asyqwTl05gtNhrLQtUsUXTNubHs0mUpLkliX/cIIKaGcUmcWx6vjEhSenosDQ7mZO1beUWB/mZfaUbt5yBdFzhaovZesen2Eznd6noF2DBZK2wPW7jd6f8+gNkKtvYU4O8TjESIEy8OwybP0uWyqtRXgZy/fCt9X7XZ7CL2/QsKS5jf69TdUJhW5maVrlY4cDMZslBnrxvHrL1lqZ1uJvNjLJBisQJOzBjMhsWIePB8wp/lt1/tz3PbxLYzzOk6cLjJatYTETk3D+1IIlf1o0TCEolnzzqwm3fKV0mLTsc4CxXJiN5DkQ1Un18Tu4phL5dhVL+vPH5lb9LMWzQk6hxmZeZoawcS5TzBGKcIRdr3Mieq/ggUXhXn92S2pPQ2WeB0i3y243S8FVvFwCyRjGVypVupk6qtA2UiYatAzfW42BWMCF1ucLo6O/pysDFvqBeg9tP2Nlq67zJCr3XVFiokuDOtgDJOL0/HJ6eXN6cvT49FKuHN2fjV6fRifHyatkRIXsr/wOhqZBSK2DDxXeP0kysXlneUbmp2ugwP3coSfievxj+eXgOz55c359enl68vJ1cbvI5QR6a/GTdRndKrqV3bkVh0vjlhiYSoVTd6TjcAIQk587yPuCCR0BhRh/ojdHV8UTyesLy/piAtHJUcVDKM31CgN65et+RkJmeN+vGKvBJeVcmQ02uGBFaioVrhatv5oSu+7RazjJmNVTfaMYLd88CHnVO4rttXXqyP55Cx4wjCZ9VbuEjXDsTx0xAddxxE3nijAqVxi5MY/JXFFHweNxYO50RaT118+o44sRm/UvMhXZFpzt81pkF4vqcq5zfvNCbot2S9Ne8mzcwpYCGktgDoD02CjUqpbRtd6ehAVX6PiRDRkPp0sX4heGzns36WlEdy0jWGEtYNN6sgbU4SVjW52zuqmoBL5jj2o1fUBbxBv6uraonyfoJcn98qxdjB+5/xcv0LgJrxHzAjsLOzWL4JNovdBdkjEFSV/3M4KN7/HB4Nj5r4z2OANhuLCH0rDqtlQY0nqFdMAQrlma5z15uBN5UEjC6oe5LKxnMpGx87cvSwgE5JrITHs8oBf3Ag50swazX1n8F5tvaLwBX6f3DQK+Z/gwFo8v8eBcT1qanZcoFxHC0p8/6n3t+5/V76PNntsA9zRtgl9Ukd/a6juSz2hTdliVvdHxmNQ+laWduThlq5o4doakZ4+GZJB5Y9is0KEaPxSEmJ2dRRY9cPRqykpMTEy4c6SsvM5iqukPudVYNfNdODFCZWuuEeVz/uhY2Sv8L0VywDx5uTuS2gvjmXKofHTUvzTLS/a28Sb7c3yaTeLDfqpH1X9RuGx4ItQDxLMyyu3ksHf18caTb8crYsedOhFzrB3Sr4CsHVbxvm3mwzG4SeIZxGBZwZxAqKVMm0tDAv6c6neAIHOtAiy+WlLN+cPbmxhNRLGmb3cgmiPDHmHrA6PuYEGYSVbBTMQBWBX1WetdioekNn6gd4hdmPjkrmAqmJI/mSoI415NL6dJ/QJV0lsyFfEvCyWj1z0tfw9hI6faltcxyq/I+y2RaY1aRAEih3sL9r3YBGBD6DD6NOmiulLRL/IBv7XE35JzO10IWOmCVTsIPDVpocY2wCFfyAr/UG9Ffac4U8zcUzPo5r+Lk30i8Uavp/yiDV9AArz39QV8j/60FR4/89AtROOypNGFTV5SaqduLRPtqe9CKS2Dh/QdaTkzqdGWg62yApUA0eRCubo0jmzZ2H+G1M/uCnwNr6Ly13PQNQpf/Dw+L7HwcH/Sb+8yiwRZ3lKv/F8n6U1mrHZnKRi//sl7eT3s9Z8ucIDQYHcgz5izR5u4AZnF9q3ct9kvV/mP7ro8SeZqBK//uDYvxnMDxq9v9HgV36n/jnnzWI+7kn6E8OdfVfpS3LnOe9nYAK/e91+8X7n8FB4/8/Dmj/n7xNt6B0l+WEZG/QoHYiDe3iKSBJZS/GMKaq/FjIyl5Hg11p9XVMRtWY1G19+nnK9g8+eXcty+TY5JDF0AjLXiXquB6/bYWYAUeRzqhUDoOsvuFcxE1J4LB1GBE375Xor2zkCAt6oR8vvMB2uGdDPzM8wyps5dBVoSvRpDDPc676B8UdlDKTZZe05xhYaG9ncOP9iM8tlg08EtS0/3chrv8d4Or4T/H81x8cNu9/PAoU4j9ifdXn/9yClW9vRsT1/X+/rQ3+tY6HX1B3nMbD93+FFPre04NMT2zyEJXme5a9yyLKN95nqcpjggbqKkkntksEVaJSl4y9S8yY2djO2n0JNnUv/Vc5dQ/+AHiF/vePhsXvf/d6R03851FAveohvYXk+17gUsT2wmFCw1PxAKEQlzjZV1Gz285O2YsaEV6MkNwzhLqFxksik/kZjS7EJ4NBE1tm3s0I9VrFXB1Zol9bOux+IxCSOzj0/vcWaN9IujXSZKV5tLu1ty2sU7vVMnLgRSMzP0AhFfL6gYO0mXyjY0crMxNgR7N8DsCOhioLYBelbe86jJD0/lqtzdz+Efr1v61Cpr4sK0TmUhJfo7K8UvEq/tco+dTSSP5OMkxDHHP1toFMRJd1CCm6l4bIGV/gzVJtzZ8zn846Kyxic51Z7PluR5LunFBYLyY/CK1om4KcSDGlC5/cZO9DKVwLr9zhQKNJgW0f2N22Lkg/QN+zez373Zc9qt7GqNr/fCZG1lcVtm23Wrng46il8s6TlwfglH7YlTqjK8s/bFD2WQP9kWrRqPOG0yAR4uwTA6Ut5Mv/va5KEtZv5vcOxGP25nbhvW3jre18sNiaYx4ljdJ3s/uHP3pi+FuudpQk6yVPPm0jhdyi9+my566g/vPTdTT79+2zQlVyq2RWl777/rVMDJJdeG4v/9gXj3KhkrGpNSJ6LhIznB1aZXH+tDsSR8k/pivSQAMNNNBAAw000EADDTTQQAMNNNDAJ4D/A4oOtXwAeAAA
+      chart: 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
       values:
         image:
           tag: v1.14.0-dev

go.mod

@@ -10,11 +10,11 @@ require (
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
 	github.com/frankban/quicktest v1.9.0 // indirect
 	github.com/gardener/etcd-druid v0.3.0
-	github.com/gardener/gardener v1.7.1-0.20200803051903-729a1cce46be
+	github.com/gardener/gardener v1.8.0
 	github.com/gardener/machine-controller-manager v0.33.0
 	github.com/go-logr/logr v0.1.0
 	github.com/gobuffalo/packr/v2 v2.8.0
-	github.com/golang/mock v1.4.3
+	github.com/golang/mock v1.4.4-0.20200731163441-8734ec565a4d
 	github.com/nwaples/rardecode v1.1.0 // indirect
 	github.com/onsi/ginkgo v1.11.0
 	github.com/onsi/gomega v1.8.1