chore: bump ControlPlane default version to 3.2.0

Kong · Jun 12, 2024 · 7ecb7b8 · 7ecb7b8
1 parent f883540
commit 7ecb7b8
Show file tree

Hide file tree

Showing 12 changed files with 1,453 additions and 17 deletions.
diff --git a/config/rbac/role/role.yaml b/config/rbac/role/role.yaml
@@ -123,6 +123,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongcustomentities
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongcustomentities/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - configuration.konghq.com
   resources:

diff --git a/internal/versions/controlplane.go b/internal/versions/controlplane.go
@@ -13,7 +13,7 @@ const (
 	// and those tests create KIC's URLs for things like roles or CRDs.
 	// Since KIC only defines the full tags in its repo (as expected) we cannot use
 	// a partial version here, as it would not match KIC's tag.
-	DefaultControlPlaneVersion = "3.1.3" // renovate: datasource=docker depName=kong/kubernetes-ingress-controller
+	DefaultControlPlaneVersion = "3.2.0" // renovate: datasource=docker depName=kong/kubernetes-ingress-controller
 )
 
 // minimumControlPlaneVersion indicates the bare minimum version of the
@@ -34,7 +34,8 @@ var minimumControlPlaneVersion = semver.MustParse("3.1.2")
 // the release 5.0, a new entry '">=5.0": "5.0"' should be added to this map, and the previous most
 // updated entry should be limited to "<5.0".
 var ManifestsVersionsForKICVersions = map[string]semver.Version{
-	">=3.1": semver.MustParse("3.1.3"),
+	">=3.2":       semver.MustParse("3.2.0"),
+	">=3.1, <3.2": semver.MustParse("3.1.6"),
 }
 
 // IsControlPlaneImageVersionSupported is a helper intended to validate the

diff --git a/pkg/utils/kubernetes/resources/clusterrole_helpers_test.go b/pkg/utils/kubernetes/resources/clusterrole_helpers_test.go
@@ -23,7 +23,7 @@ func TestClusterroleHelpers(t *testing.T) {
 			controlplane: "test_3.1.2",
 			image:        "kong/kubernetes-ingress-controller:3.1.2",
 			expectedClusterRole: func() *rbacv1.ClusterRole {
-				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_1("test_3.1.2")
+				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_1_lt3_2("test_3.1.2")
 				resources.LabelObjectAsControlPlaneManaged(cr)
 				return cr
 			},
@@ -33,7 +33,7 @@ func TestClusterroleHelpers(t *testing.T) {
 			image:        "kong/kubernetes-ingress-controller:3.1",
 			devMode:      true,
 			expectedClusterRole: func() *rbacv1.ClusterRole {
-				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_1("test_3.1_dev")
+				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_2("test_3.1_dev")
 				resources.LabelObjectAsControlPlaneManaged(cr)
 				return cr
 			},
@@ -48,7 +48,7 @@ func TestClusterroleHelpers(t *testing.T) {
 			image:        "kong/kubernetes-ingress-controller:3.0.0",
 			devMode:      true,
 			expectedClusterRole: func() *rbacv1.ClusterRole {
-				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_1("test_3.0_dev")
+				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_2("test_3.0_dev")
 				resources.LabelObjectAsControlPlaneManaged(cr)
 				return cr
 			},
@@ -63,7 +63,7 @@ func TestClusterroleHelpers(t *testing.T) {
 			image:        "kong/kubernetes-ingress-controller:1.0",
 			devMode:      true,
 			expectedClusterRole: func() *rbacv1.ClusterRole {
-				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_1("test_unsupported_dev")
+				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_2("test_unsupported_dev")
 				resources.LabelObjectAsControlPlaneManaged(cr)
 				return cr
 			},
@@ -78,7 +78,17 @@ func TestClusterroleHelpers(t *testing.T) {
 			image:        "test/development:main",
 			devMode:      true,
 			expectedClusterRole: func() *rbacv1.ClusterRole {
-				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_1("test_invalid_tag_dev")
+				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_2("test_invalid_tag_dev")
+				resources.LabelObjectAsControlPlaneManaged(cr)
+				return cr
+			},
+		},
+		{
+			controlplane: "cp-3-2-0",
+			image:        "kong/kubernetes-ingress-controller:3.2.0",
+			devMode:      false,
+			expectedClusterRole: func() *rbacv1.ClusterRole {
+				cr := clusterroles.GenerateNewClusterRoleForControlPlane_ge3_2("cp-3-2-0")
 				resources.LabelObjectAsControlPlaneManaged(cr)
 				return cr
 			},

diff --git a/...nerated_controlplane_clusterrole_ge3_1.go → ...d_controlplane_clusterrole_ge3_1_lt3_2.go b/...nerated_controlplane_clusterrole_ge3_1.go → ...d_controlplane_clusterrole_ge3_1_lt3_2.go