updating cml and networking-ingress

gardener · May 19, 2021 · e0c3058 · e0c3058
1 parent f5bb096
commit e0c3058
Show file tree

Hide file tree

Showing 1,291 changed files with 122,463 additions and 41,248 deletions.
diff --git a/cmd/cert-controller-manager/main.go b/cmd/cert-controller-manager/main.go
@@ -11,7 +11,7 @@ import (
 	"os"
 
 	corev1 "k8s.io/api/core/v1"
-	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
+	networkingv1beta1 "k8s.io/api/networking/v1beta1"
 
 	"github.com/gardener/controller-manager-library/pkg/controllermanager"
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/cluster"
@@ -54,16 +54,21 @@ func init() {
 	mappings.ForControllerGroup(ctrl.ControllerGroupSource).
 		MustRegister()
 
-	resources.Register(extensionsv1beta1.SchemeBuilder)
+	resources.Register(networkingv1beta1.SchemeBuilder)
 	resources.Register(corev1.SchemeBuilder)
 	resources.Register(dnsapi.SchemeBuilder)
 	resources.Register(v1alpha1.SchemeBuilder)
 }
 
+func migrateExtensionsIngress(c controllermanager.Configuration) controllermanager.Configuration {
+	return c.GlobalGroupKindMigrations(resources.NewGroupKind("extensions", "Ingress"),
+		resources.NewGroupKind("networking.k8s.io", "Ingress"))
+}
+
 func main() {
 	if len(os.Args) == 2 && os.Args[1] == "version" {
 		fmt.Println(version)
 		os.Exit(0)
 	}
-	controllermanager.Start("cert-controller-manager", "Certificate controller manager", "nothing")
+	controllermanager.Start("cert-controller-manager", "Certificate controller manager", "nothing", migrateExtensionsIngress)
 }
diff --git a/examples/40-ingress-echoheaders.yaml b/examples/40-ingress-echoheaders.yaml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: echoheaders

diff --git a/go.mod b/go.mod
@@ -5,22 +5,20 @@ go 1.16
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
 	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
-	github.com/gardener/controller-manager-library v0.2.1-0.20201009144316-bfa57b871e60
+	github.com/gardener/controller-manager-library v0.2.1-0.20210519160602-fb05e73bad23
 	github.com/gardener/external-dns-management v0.7.21
 	github.com/go-acme/lego/v4 v4.1.3
 	github.com/go-openapi/spec v0.19.4 // indirect
 	github.com/miekg/dns v1.1.31
-	github.com/onsi/ginkgo v1.14.0
-	github.com/onsi/gomega v1.10.1
+	github.com/onsi/ginkgo v1.14.1
+	github.com/onsi/gomega v1.10.2
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.1.0
-	github.com/prometheus/common v0.7.0 // indirect
-	github.com/prometheus/procfs v0.0.5 // indirect
+	github.com/prometheus/client_golang v1.7.1
 	golang.org/x/lint v0.0.0-20200302205851-738671d3881b
-	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.6
-	k8s.io/client-go v0.18.6
-	k8s.io/code-generator v0.18.6
-	k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
-	sigs.k8s.io/kind v0.8.0
+	k8s.io/api v0.20.6
+	k8s.io/apimachinery v0.20.6
+	k8s.io/client-go v0.20.6
+	k8s.io/code-generator v0.20.6
+	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
+	sigs.k8s.io/kind v0.10.0
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/apis/cert/crds/cert.gardener.cloud_certificaterevocations.yaml b/pkg/apis/cert/crds/cert.gardener.cloud_certificaterevocations.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: certificaterevocations.cert.gardener.cloud
 spec:

diff --git a/pkg/apis/cert/crds/cert.gardener.cloud_certificates.yaml b/pkg/apis/cert/crds/cert.gardener.cloud_certificates.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: certificates.cert.gardener.cloud
 spec:

diff --git a/pkg/apis/cert/crds/cert.gardener.cloud_issuers.yaml b/pkg/apis/cert/crds/cert.gardener.cloud_issuers.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: issuers.cert.gardener.cloud
 spec:

diff --git a/pkg/apis/cert/crds/zz_generated_crds.go b/pkg/apis/cert/crds/zz_generated_crds.go
@@ -1,5 +1,5 @@
 /*
-SPDX-FileCopyrightText: YEAR SAP SE or an SAP affiliate company and Gardener contributors
+Copyright (c) YEAR SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
 
 SPDX-License-Identifier: Apache-2.0
 */
@@ -22,7 +22,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: certificaterevocations.cert.gardener.cloud
 spec:
@@ -267,7 +267,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: certificates.cert.gardener.cloud
 spec:
@@ -451,7 +451,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: issuers.cert.gardener.cloud
 spec:

diff --git a/pkg/apis/cert/v1alpha1/register.go b/pkg/apis/cert/v1alpha1/register.go
@@ -62,4 +62,4 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
-}
+}
diff --git a/pkg/client/cert/clientset/versioned/fake/register.go b/pkg/client/cert/clientset/versioned/fake/register.go
diff --git a/pkg/client/cert/listers/cert/v1alpha1/certificate.go b/pkg/client/cert/listers/cert/v1alpha1/certificate.go
diff --git a/pkg/client/cert/listers/cert/v1alpha1/certificaterevocation.go b/pkg/client/cert/listers/cert/v1alpha1/certificaterevocation.go
diff --git a/pkg/client/cert/listers/cert/v1alpha1/issuer.go b/pkg/client/cert/listers/cert/v1alpha1/issuer.go
diff --git a/pkg/controller/source/ingress/controller.go b/pkg/controller/source/ingress/controller.go
@@ -13,7 +13,7 @@ import (
 	ctrl "github.com/gardener/cert-management/pkg/controller"
 )
 
-var mainResource = resources.NewGroupKind("extensions", "Ingress")
+var mainResource = resources.NewGroupKind("networking.k8s.io", "Ingress")
 
 func init() {
 	source.CertSourceController(source.NewCertSourceTypeForCreator("ingress-cert", mainResource, NewIngressSource), nil).

diff --git a/pkg/controller/source/ingress/handler.go b/pkg/controller/source/ingress/handler.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"strings"
 
-	api "k8s.io/api/extensions/v1beta1"
+	api "k8s.io/api/networking/v1beta1"
 
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/controller"
 	"github.com/gardener/controller-manager-library/pkg/logger"

diff --git a/test/functional/run.sh b/test/functional/run.sh
@@ -128,7 +128,7 @@ if [ "$LOCAL_APISERVER" != "" ]; then
   echo using local kube-apiserver and etcd
 
   # download kube-apiserver, etcd, and kubectl executables from kubebuilder release
-  KUBEBUILDER_VERSION=1.0.8
+  KUBEBUILDER_VERSION=2.3.2
   ARCH=$(go env GOARCH)
   GOOS=$(go env GOOS)
   KUBEBUILDER_BIN_DIR=$(realpath -m kubebuilder_${KUBEBUILDER_VERSION}_${GOOS}_${ARCH}/bin)

diff --git a/vendor/github.com/Masterminds/semver/.travis.yml b/vendor/github.com/Masterminds/semver/.travis.yml
diff --git a/vendor/github.com/Masterminds/semver/CHANGELOG.md b/vendor/github.com/Masterminds/semver/CHANGELOG.md