Upgrade to landscaper v0.76.0 (#206)

* upgrade to landscaper v0.76.0 (run-int-tests) * adapt to new webhook lib (run-int-tests)
gardener · Aug 25, 2023 · 3284575 · 3284575
1 parent 185b7aa
commit 3284575
Show file tree

Hide file tree

Showing 44 changed files with 1,602 additions and 83 deletions.
diff --git a/.landscaper/landscaper-instance/blueprint/landscaper/deploy-execution.yaml b/.landscaper/landscaper-instance/blueprint/landscaper/deploy-execution.yaml
@@ -20,7 +20,7 @@ deployItems:
             resourceSelector:
               - apiVersion: landscaper.gardener.cloud/v1alpha1
                 kind: LsHealthCheck
-                name: {{ .imports.hostingClusterNamespace }}
+                name: landscaper
                 namespace: {{ .imports.hostingClusterNamespace }}
             requirements:
               - jsonPath: .status

diff --git a/.landscaper/landscaper-instance/component-references.yaml b/.landscaper/landscaper-instance/component-references.yaml
@@ -1,5 +1,5 @@
 ---
 componentName: github.com/gardener/landscaper
 name: landscaper
-version: v0.75.0
+version: v0.76.0
 ...
diff --git a/cmd/landscaper-service-webhooks-server/app/app.go b/cmd/landscaper-service-webhooks-server/app/app.go
@@ -134,11 +134,14 @@ func registerWebhooks(ctx context.Context,
 	// generate certificates
 	var err error
 	dnsNames := webhookcert.GeDNSNamesFromNamespacedName(wo.ServiceNamespace, wo.ServiceName)
-	wo.CABundle, err = webhookcert.GenerateCertificates(ctx, kubeClient, certDir, o.webhook.certificatesNamespace, "landscaper-service-webhook", "landscaper-service-webhook-cert", dnsNames)
+	caCert, _, err := webhookcert.GenerateCertificates(ctx, kubeClient, certDir, o.webhook.certificatesNamespace,
+		"landscaper-service-webhook", "landscaper-service-webhook-cert", dnsNames)
 	if err != nil {
 		return fmt.Errorf("unable to generate webhook certificates: %w", err)
 	}
 
+	wo.CABundle = caCert.CertificatePEM
+
 	// log which resources are being watched
 	webhookedResourcesLog := []string{}
 	for _, elem := range wo.WebhookedResources {

diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.20
 
 require (
 	github.com/gardener/component-spec/bindings-go v0.0.66
-	github.com/gardener/landscaper/apis v0.75.0
-	github.com/gardener/landscaper/controller-utils v0.75.0
+	github.com/gardener/landscaper/apis v0.76.0
+	github.com/gardener/landscaper/controller-utils v0.76.0
 	github.com/go-logr/logr v1.2.4
 	github.com/google/uuid v1.3.0
 	github.com/onsi/ginkgo v1.16.5
@@ -19,7 +19,7 @@ require (
 	k8s.io/code-generator v0.27.2
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.15.0
+	sigs.k8s.io/controller-runtime v0.15.1
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -89,10 +89,10 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/gardener/component-spec/bindings-go v0.0.66 h1:FvtnnTxXJi2ZCC/GgijUNJCcwwdlZAiEWpZTtyHviz0=
 github.com/gardener/component-spec/bindings-go v0.0.66/go.mod h1:qr7kADDXbXB0huul+ih/B43YkwyiMFYQepp/tqJ331c=
-github.com/gardener/landscaper/apis v0.75.0 h1:4N+UG2rCqz6InttA7ncxvq2KeEiWRuhWOjHE1NKGwnI=
-github.com/gardener/landscaper/apis v0.75.0/go.mod h1:MTl0cPmwUhYB2QUFiCUkVqmH/iWt4PJ55PTPbrXXEQo=
-github.com/gardener/landscaper/controller-utils v0.75.0 h1:o18H1e4jram9KkR8asKgdmaQEk664gzvJ27lFWspt6A=
-github.com/gardener/landscaper/controller-utils v0.75.0/go.mod h1:dWD1WsGePMAILOa37OOW7jACfiTMp8wz9rM3ATYXv5w=
+github.com/gardener/landscaper/apis v0.76.0 h1:e4OQ2/lRtnSaaOIapZ5dYpfMwmHE5dgehCN6AJAqw1E=
+github.com/gardener/landscaper/apis v0.76.0/go.mod h1:MTl0cPmwUhYB2QUFiCUkVqmH/iWt4PJ55PTPbrXXEQo=
+github.com/gardener/landscaper/controller-utils v0.76.0 h1:VeJK38yuAbJ/FqqRXhnWaPwStcX9tpqMTHXPkDID2HQ=
+github.com/gardener/landscaper/controller-utils v0.76.0/go.mod h1:DPP6H935DrtDtAPujx2LFyKU1X5xSCjJYaiIKFLwFu8=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -639,8 +639,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
-sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
-sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
+sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
+sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

diff --git a/integration-test/go.mod b/integration-test/go.mod
@@ -5,13 +5,13 @@ go 1.20
 require (
 	github.com/gardener/component-spec/bindings-go v0.0.66
 	github.com/gardener/landscaper-service v0.0.0-00010101000000-000000000000
-	github.com/gardener/landscaper/apis v0.75.0
-	github.com/gardener/landscaper/controller-utils v0.75.0
+	github.com/gardener/landscaper/apis v0.76.0
+	github.com/gardener/landscaper/controller-utils v0.76.0
 	github.com/gardener/landscapercli v0.21.0
 	k8s.io/api v0.27.3
 	k8s.io/apimachinery v0.27.3
 	k8s.io/client-go v0.27.3
-	sigs.k8s.io/controller-runtime v0.15.0
+	sigs.k8s.io/controller-runtime v0.15.1
 )
 
 require (

diff --git a/integration-test/go.sum b/integration-test/go.sum
@@ -47,10 +47,10 @@ github.com/gardener/component-spec/bindings-go v0.0.66/go.mod h1:qr7kADDXbXB0huu
 github.com/gardener/image-vector v0.10.0 h1:Ysg3hxfiGUG/doajiZ0nQuUaJYwfO5BZCOcijL3tRuo=
 github.com/gardener/landscaper v0.52.0 h1:jIaVtyGjS1OIoDdOXOYnF91hZA0q2YFC4h8LBfOSYbw=
 github.com/gardener/landscaper v0.52.0/go.mod h1:zQdeb1pC75ou9MVSos19MG1MSel5t9u11UWQO1SXK68=
-github.com/gardener/landscaper/apis v0.75.0 h1:4N+UG2rCqz6InttA7ncxvq2KeEiWRuhWOjHE1NKGwnI=
-github.com/gardener/landscaper/apis v0.75.0/go.mod h1:MTl0cPmwUhYB2QUFiCUkVqmH/iWt4PJ55PTPbrXXEQo=
-github.com/gardener/landscaper/controller-utils v0.75.0 h1:o18H1e4jram9KkR8asKgdmaQEk664gzvJ27lFWspt6A=
-github.com/gardener/landscaper/controller-utils v0.75.0/go.mod h1:dWD1WsGePMAILOa37OOW7jACfiTMp8wz9rM3ATYXv5w=
+github.com/gardener/landscaper/apis v0.76.0 h1:e4OQ2/lRtnSaaOIapZ5dYpfMwmHE5dgehCN6AJAqw1E=
+github.com/gardener/landscaper/apis v0.76.0/go.mod h1:MTl0cPmwUhYB2QUFiCUkVqmH/iWt4PJ55PTPbrXXEQo=
+github.com/gardener/landscaper/controller-utils v0.76.0 h1:VeJK38yuAbJ/FqqRXhnWaPwStcX9tpqMTHXPkDID2HQ=
+github.com/gardener/landscaper/controller-utils v0.76.0/go.mod h1:DPP6H935DrtDtAPujx2LFyKU1X5xSCjJYaiIKFLwFu8=
 github.com/gardener/landscapercli v0.21.0 h1:FbIVNMUUQod74uVbh79TiHLDNxbuE1LET8ukfvL8w1Y=
 github.com/gardener/landscapercli v0.21.0/go.mod h1:tZzrKBf8wfMHDZVk6qwO7tymrbC7OWIOAnanotv+ANU=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
@@ -363,8 +363,8 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5F
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
-sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
+sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
+sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

diff --git a/...gration-test/vendor/github.com/gardener/landscaper/apis/config/types_landscaper_config.go b/...gration-test/vendor/github.com/gardener/landscaper/apis/config/types_landscaper_config.go
diff --git a/...est/vendor/github.com/gardener/landscaper/apis/config/v1alpha1/types_landscaper_config.go b/...est/vendor/github.com/gardener/landscaper/apis/config/v1alpha1/types_landscaper_config.go
diff --git a/...est/vendor/github.com/gardener/landscaper/apis/config/v1alpha1/zz_generated.conversion.go b/...est/vendor/github.com/gardener/landscaper/apis/config/v1alpha1/zz_generated.conversion.go
diff --git a/...-test/vendor/github.com/gardener/landscaper/apis/config/v1alpha1/zz_generated.deepcopy.go b/...-test/vendor/github.com/gardener/landscaper/apis/config/v1alpha1/zz_generated.deepcopy.go
diff --git a/integration-test/vendor/github.com/gardener/landscaper/apis/config/zz_generated.deepcopy.go b/integration-test/vendor/github.com/gardener/landscaper/apis/config/zz_generated.deepcopy.go
diff --git a/...-test/vendor/github.com/gardener/landscaper/controller-utils/pkg/kubernetes/kubernetes.go b/...-test/vendor/github.com/gardener/landscaper/controller-utils/pkg/kubernetes/kubernetes.go