Add support for AS3 3.50

F5Networks · Feb 29, 2024 · 72186e1 · 72186e1
1 parent ba79d69
commit 72186e1
Show file tree

Hide file tree

Showing 13 changed files with 1,020 additions and 697 deletions.
diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst
@@ -20,6 +20,7 @@ Added Functionality
       * `Issue 3295 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3295>`_: Support for setting the default pool via policy CRD for virtual server and nextgen routes. `Example <https://github.com/F5Networks/k8s-bigip-ctlr/blob/2.x-master/docs/config_examples/customResource/Policy>`_
     * Support for pool-member-type auto for CRD, NextGen Routes and multiCluster mode. Please refer `Documentation <https://github.com/F5Networks/k8s-bigip-ctlr/blob/2.x-master/docs/config_examples/PoolType-Auto/README.md>`.
     * Support for CIS deployment parameters "trusted-certs-cfgmap" && "insecure"  in CRD and NextGen
+    * CIS compatible with AS3 3.50
 
 Bug Fixes
 ````````````

diff --git a/docs/upgradeProcess.md b/docs/upgradeProcess.md
@@ -43,6 +43,7 @@ Compatibility Matrix
 | v2.14.0     | v17.0          | v1.27              | v4.12.0*                                                      | Yes | Yes                | v3.45       | v0.1.9      | v0.0.4            | v0.0.26           | Red Hat Enterprise Linux release 9.1 (Plow)         |
 | v2.15.0     | v17.0          | v1.28              | v4.13.0*                                                      | Yes | Yes                | v3.48       | v0.1.9      | v0.0.4            | v0.0.27           | Red Hat Enterprise Linux release 9.1 (Plow)         |
 | v2.15.1     | v17.0          | v1.29              | v4.14.0*                                                      | Yes | Yes                | v3.48       | v0.1.9      | v0.0.4            | v0.0.28           | Red Hat Enterprise Linux release 9.1 (Plow)         |
+| v2.16       | v17.0          | v1.29              | v4.14.0*                                                      | Yes | Yes                | v3.50       | v0.1.9      | v0.0.4            | v0.0.28           | Red Hat Enterprise Linux release 9.1 (Plow)         |
 
 Note: For OCP version 4.12, CIS is compatible with IPv4 and dual stack IPv4.
 
@@ -53,6 +54,7 @@ Compatibility Matrix for Multi Cluster Support
 |-------------|----------------|--------------------|-------------------|----------|-----|--------------------|-------------|-------------------|
 | v2.14.0     | v16.0          | v1.27              | v4.12.0           | Yes      | No  | Yes                | v3.45       | v0.0.26           |
 | v2.15.0     | v16.0          | v1.28              | v4.13.0           | Yes      | No  | Yes                | v3.48       | v0.0.27           |
+| v2.16.0     | v17.0          | v1.29              | v4.14.0*           | Yes      | No  | Yes                | v3.50       | v0.0.27           |
 
 
 

diff --git a/pkg/agent/as3/as3Manager.go b/pkg/agent/as3/as3Manager.go
@@ -37,9 +37,9 @@ const (
 	as3SupportedVersion = 3.18
 	// Update as3Version,defaultAS3Version,defaultAS3Build while updating AS3 validation schema.
 	// While upgrading version update $id value in schema json to https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/latest/as3-schema.json
-	as3Version           = 3.48
-	defaultAS3Version    = "3.48.0"
-	defaultAS3Build      = "10"
+	as3Version           = 3.50
+	defaultAS3Version    = "3.50.0"
+	defaultAS3Build      = "3"
 	as3tenant            = "Tenant"
 	as3class             = "class"
 	as3SharedApplication = "Shared"
@@ -48,7 +48,7 @@ const (
 	as3template          = "template"
 	// as3SchemaLatestURL   = "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/latest/as3-schema.json"
 	as3defaultRouteDomain = "defaultRouteDomain"
-	as3SchemaFileName     = "as3-schema-3.48.0-10-cis.json"
+	as3SchemaFileName     = "as3-schema-3.50.0-3-cis.json"
 )
 
 var baseAS3Config = `{

diff --git a/pkg/agent/as3/as3Manager_test.go b/pkg/agent/as3/as3Manager_test.go
@@ -48,9 +48,9 @@ var _ = Describe("AS3Manager Tests", func() {
 	var mockMgr *mockAS3Manager
 	BeforeEach(func() {
 		mockMgr = newMockAS3Manager(&Params{
-			As3Version:       "3.48.0",
-			As3Release:       "3.48.0-10",
-			As3SchemaVersion: "3.48.0",
+			As3Version:       "3.50.0",
+			As3Release:       "3.50.0-3",
+			As3SchemaVersion: "3.50.0",
 		})
 		mockMgr.Resources = &AgentResources{}
 	})

diff --git a/pkg/agent/as3/as3Resource_test.go b/pkg/agent/as3/as3Resource_test.go
@@ -200,7 +200,7 @@ var _ = Describe("AS3Manager Tests", func() {
 		Expect(DeepEqualJSON(mockMgr.as3ActiveConfig.unifiedDeclaration, unifiedDecl)).To(BeTrue())
 
 		// verify with multiple client ssl profiles
-		mockMgr.bigIPAS3Version = 3.48
+		mockMgr.bigIPAS3Version = 3.50
 		clientSecret2 := SecretKey{Name: "test-client-secret2", ResourceName: "test_virtual_secure"}
 		clientSecret3 := SecretKey{Name: "test-server-secret3", ResourceName: "test_virtual_secure"}
 		mockMgr.Profs[clientSecret2] = CustomProfile{

diff --git a/pkg/controller/backend_test.go b/pkg/controller/backend_test.go
@@ -509,7 +509,7 @@ var _ = Describe("Backend Tests", func() {
 			map1 := map[string]string{
 				"version":       "3.98.0",
 				"release":       "1",
-				"schemaCurrent": "3.48.0",
+				"schemaCurrent": "3.50.0",
 				"schemaMinimum": "3.18.0",
 			}
 			// start a test http server
@@ -533,7 +533,7 @@ var _ = Describe("Backend Tests", func() {
 			agentParams.VXLANName = "vxlan500"
 			agentParams.PostParams.BIGIPURL = "http://" + server.Addr()
 			agent := NewAgent(agentParams)
-			Expect(agent.AS3VersionInfo.as3Version).To(Equal("3.48.0"))
+			Expect(agent.AS3VersionInfo.as3Version).To(Equal("3.50.0"))
 			agent.Stop()
 
 		})

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -128,9 +128,9 @@ const (
 	as3SupportedVersion = 3.18
 	//Update as3Version,defaultAS3Version,defaultAS3Build while updating AS3 validation schema.
 	//While upgrading version update $id value in schema json to https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/latest/as3-schema.json
-	as3Version        = 3.48
-	defaultAS3Version = "3.48.0"
-	defaultAS3Build   = "10"
+	as3Version        = 3.50
+	defaultAS3Version = "3.50.0"
+	defaultAS3Build   = "3"
 	clusterHealthPath = "/readyz"
 )
 

diff --git a/pkg/test/configs/as3_multi_cm_unified_nodeport_local.json b/pkg/test/configs/as3_multi_cm_unified_nodeport_local.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.50.0/as3-schema-3.50.0-3.json",
   "class": "AS3",
   "persist": true,
   "logLevel": "error",
@@ -248,6 +248,6 @@
     "id": "urn:uuid:85626792-9ee7-46bb-8fc8-4ba708cfdc1d",
     "label": "CIS Declaration",
     "remark": "Auto-generated by CIS",
-    "schemaVersion": "3.48.0"
+    "schemaVersion": "3.50.0"
   }
 }
diff --git a/pkg/test/configs/as3_route_cfgmap_declaration.json b/pkg/test/configs/as3_route_cfgmap_declaration.json
@@ -1,11 +1,11 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.50.0/as3-schema-3.50.0-3.json",
   "class": "AS3",
   "persist": true,
   "logLevel": "error",
   "declaration": {
     "class": "ADC",
-    "schemaVersion": "3.48.0",
+    "schemaVersion": "3.50.0",
     "id": "urn:uuid:85626792-9ee7-46bb-8fc8-4ba708cfdc1d",
     "label": "CIS Declaration",
     "remark": "Auto-generated by CIS",

diff --git a/pkg/test/configs/as3_route_declaration.json b/pkg/test/configs/as3_route_declaration.json
@@ -1,9 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.50.0/as3-schema-3.50.0-3.json",
   "class": "AS3",
   "declaration": {
     "class": "ADC",
-    "schemaVersion": "3.48.0",
+    "schemaVersion": "3.50.0",
     "id": "urn:uuid:85626792-9ee7-46bb-8fc8-4ba708cfdc1d",
     "label": "CIS Declaration",
     "remark": "Auto-generated by CIS",

diff --git a/pkg/test/configs/as3_route_declaration_overridden.json b/pkg/test/configs/as3_route_declaration_overridden.json
@@ -1,9 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.50.0/as3-schema-3.50.0-3.json",
   "class": "AS3",
   "declaration": {
     "class": "ADC",
-    "schemaVersion": "3.48.0",
+    "schemaVersion": "3.50.0",
     "id": "urn:uuid:85626792-9ee7-46bb-8fc8-4ba708cfdc1d",
     "label": "CIS Declaration",
     "remark": "Auto-generated by CIS",

diff --git a/pkg/test/configs/as3config_multi_cm_unified.json b/pkg/test/configs/as3config_multi_cm_unified.json
@@ -1,9 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.50.0/as3-schema-3.50.0-3.json",
   "class": "AS3",
   "declaration": {
     "class": "ADC",
-    "schemaVersion": "3.48.0",
+    "schemaVersion": "3.50.0",
     "id": "urn:uuid:85626792-9ee7-46bb-8fc8-4ba708cfdc1d",
     "label": "CIS Declaration",
     "remark": "Auto-generated by CIS",