Remove cloud profile from shoot matcher

kyma-project · Oct 22, 2024 · 238e05c · 238e05c
1 parent fe30cb6
commit 238e05c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 25 deletions.
diff --git a/config/crd/bases/infrastructuremanager.kyma-project.io_runtimes.yaml b/config/crd/bases/infrastructuremanager.kyma-project.io_runtimes.yaml
@@ -131,9 +131,13 @@ spec:
                                     set will be used.
                                   type: string
                                 clientAuthentication:
-                                  description: ClientAuthentication can optionally
-                                    contain client configuration used for kubeconfig
-                                    generation.
+                                  description: |-
+                                    ClientAuthentication can optionally contain client configuration used for kubeconfig generation.
+
+
+                                    Deprecated: This field has no implemented use and will be forbidden starting from Kubernetes 1.31.
+                                    It's use was planned for genereting OIDC kubeconfig https://github.com/gardener/gardener/issues/1433
+                                    TODO(AleksandarSavchev): Drop this field after support for Kubernetes 1.30 is dropped.
                                   properties:
                                     extraConfig:
                                       additionalProperties:
@@ -149,7 +153,7 @@ spec:
                                   type: object
                                 clientID:
                                   description: The client ID for the OpenID Connect
-                                    client, must be set if oidc-issuer-url is set.
+                                    client, must be set.
                                   type: string
                                 groupsClaim:
                                   description: If provided, the name of a custom OpenID
@@ -166,8 +170,8 @@ spec:
                                   type: string
                                 issuerURL:
                                   description: The URL of the OpenID issuer, only
-                                    HTTPS scheme will be accepted. If set, it will
-                                    be used to verify the OIDC JSON Web Token (JWT).
+                                    HTTPS scheme will be accepted. Used to verify
+                                    the OIDC JSON Web Token (JWT).
                                   type: string
                                 requiredClaims:
                                   additionalProperties:
@@ -213,8 +217,13 @@ spec:
                                   be used.
                                 type: string
                               clientAuthentication:
-                                description: ClientAuthentication can optionally contain
-                                  client configuration used for kubeconfig generation.
+                                description: |-
+                                  ClientAuthentication can optionally contain client configuration used for kubeconfig generation.
+
+
+                                  Deprecated: This field has no implemented use and will be forbidden starting from Kubernetes 1.31.
+                                  It's use was planned for genereting OIDC kubeconfig https://github.com/gardener/gardener/issues/1433
+                                  TODO(AleksandarSavchev): Drop this field after support for Kubernetes 1.30 is dropped.
                                 properties:
                                   extraConfig:
                                     additionalProperties:
@@ -230,7 +239,7 @@ spec:
                                 type: object
                               clientID:
                                 description: The client ID for the OpenID Connect
-                                  client, must be set if oidc-issuer-url is set.
+                                  client, must be set.
                                 type: string
                               groupsClaim:
                                 description: If provided, the name of a custom OpenID
@@ -246,8 +255,8 @@ spec:
                                 type: string
                               issuerURL:
                                 description: The URL of the OpenID issuer, only HTTPS
-                                  scheme will be accepted. If set, it will be used
-                                  to verify the OIDC JSON Web Token (JWT).
+                                  scheme will be accepted. Used to verify the OIDC
+                                  JSON Web Token (JWT).
                                 type: string
                               requiredClaims:
                                 additionalProperties:
@@ -745,9 +754,11 @@ spec:
                                       description: |-
                                         SystemReserved is the configuration for resources reserved for system processes not managed by kubernetes (e.g. journald).
                                         When updating these values, be aware that cgroup resizes may not succeed on active worker nodes. Look for the NodeAllocatableEnforced event to determine if the configuration was applied.
-                                        Deprecated: Separately configuring resource reservations for system processes is deprecated in Gardener and will be removed soon.
+
+
+                                        Deprecated: Separately configuring resource reservations for system processes is deprecated in Gardener and will be forbidden starting from Kubernetes 1.31.
                                         Please merge existing resource reservations into the kubeReserved field.
-                                        TODO(MichaelEischer): Drop this field after v1.113 has been released.
+                                        TODO(MichaelEischer): Drop this field after support for Kubernetes 1.30 is dropped.
                                       properties:
                                         cpu:
                                           anyOf:

diff --git a/hack/runtime-migrator/go.mod b/hack/runtime-migrator/go.mod
@@ -5,7 +5,7 @@ go 1.23.1
 require (
 	github.com/gardener/gardener v1.100.0
 	github.com/kyma-project/infrastructure-manager v0.0.0-20241010165136-c9d296aadebd
-	github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241010165136-c9d296aadebd
+	github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241021120305-7ad2c69735bc
 	github.com/pkg/errors v0.9.1
 	k8s.io/api v0.31.1
 	k8s.io/apimachinery v0.31.1

diff --git a/hack/runtime-migrator/go.sum b/hack/runtime-migrator/go.sum
@@ -72,14 +72,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kyma-project/infrastructure-manager v0.0.0-20241009045946-e3051118000c h1:1AjsXtTYczyVyu6HRjhNwI/b1DnCpbo0A310iPfFitU=
-github.com/kyma-project/infrastructure-manager v0.0.0-20241009045946-e3051118000c/go.mod h1:zXB6/LSW8Y50NmZlg3SvQQfpKmepC+Je3WGADjXutKg=
 github.com/kyma-project/infrastructure-manager v0.0.0-20241010165136-c9d296aadebd h1:YykXh2PP2H6pMBW5dmLKT/KwServdFce4zbEPgUvHro=
 github.com/kyma-project/infrastructure-manager v0.0.0-20241010165136-c9d296aadebd/go.mod h1:zXB6/LSW8Y50NmZlg3SvQQfpKmepC+Je3WGADjXutKg=
-github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241009045946-e3051118000c h1:PfrVLyxDEjT255csGWP6qxxLPtD86Lx8jP5iK36hhYM=
-github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241009045946-e3051118000c/go.mod h1:4bf+z9t4M8+5incqcRpmoq6lv4+tRJC8reLtP1pYO+c=
-github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241010165136-c9d296aadebd h1:g+Nsu3aSZ29PrYpvg+PeLjoI66cXxLKcigs3uqmpE7E=
-github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241010165136-c9d296aadebd/go.mod h1:4bf+z9t4M8+5incqcRpmoq6lv4+tRJC8reLtP1pYO+c=
+github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241021120305-7ad2c69735bc h1:c7LixZROTaUOjbWm+yJiW6hn0zgdvWyXTn4j77lBFSo=
+github.com/kyma-project/infrastructure-manager/hack/shoot-comparator v0.0.0-20241021120305-7ad2c69735bc/go.mod h1:4bf+z9t4M8+5incqcRpmoq6lv4+tRJC8reLtP1pYO+c=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=

diff --git a/hack/shoot-comparator/pkg/shoot/matcher.go b/hack/shoot-comparator/pkg/shoot/matcher.go
@@ -136,11 +136,6 @@ func (m *Matcher) Match(actual interface{}) (success bool, err error) {
 			actual:        shootActual.Spec.ControlPlane,
 			path:          "spec/controlPlane",
 		},
-		{
-			GomegaMatcher: gomega.BeComparableTo(shootToMatch.Spec.CloudProfile),
-			actual:        shootActual.Spec.CloudProfile,
-			path:          "spec/cloudProfile",
-		},
 		{
 			GomegaMatcher: NewProviderMatcher(shootToMatch.Spec.Provider, "spec/provider"),
 			actual:        shootActual.Spec.Provider,