Add support for AS3 3.48 minor v10 (#3137)

F5Networks · Nov 10, 2023 · 63a8dad · 63a8dad
1 parent 6c99055
commit 63a8dad
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 20 deletions.
diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst
@@ -36,7 +36,7 @@ Upgrade notes
 Known Issues
 `````````````
 *  [Multi-Cluster] Route status is not updated in other HA cluster.
-*  `Issue 775 <https://github.com/F5Networks/f5-appsvcs-extension/issues/775>`_: If customer is using referenced monitor then they should not use AS3 3.48. Its recommended to use AS3 3.47 or lower on BIGIP
+*  `Issue 777 <https://github.com/F5Networks/f5-appsvcs-extension/issues/777>`_: Cluster adminState in multiCluster mode doesn't work properly with AS3 (v3.47 and v3.48) as updating pool member adminState from enable to offline fails with 422 error with AS3 (v3.47 and v3.48). If customer needs this feature, we recommend to use AS3 v3.46 or lower on BIGIP.
 
 2.14.0
 -------------

diff --git a/docs/upgradeProcess.md b/docs/upgradeProcess.md
@@ -344,4 +344,4 @@ Refer Release Notes for [CIS v2.13.1](https://github.com/F5Networks/k8s-bigip-ct
 
 ### **Upgrading from 2.14.0 to 2.15.0:**
 * Disabled default health monitoring with routes, use autoMonitor support for NextGenRoutes. See `Example <https://github.com/F5Networks/k8s-bigip-ctlr/tree/master/docs/config_examples/next-gen-routes/configmap/extendedRouteConfigwithBaseConfigWithAutoMonitor.yaml>`_
-*  `Issue 775 <https://github.com/F5Networks/f5-appsvcs-extension/issues/775>`_: If customer is using referenced monitor then they should not use AS3 3.48. Its recommended to use AS3 3.47 or lower on BIGIP
+*  `Issue 777 <https://github.com/F5Networks/f5-appsvcs-extension/issues/777>`_: Cluster adminState in multiCluster mode doesn't work properly with AS3 (v3.47 and v3.48) as updating pool member adminState from enable to offline fails with 422 error with AS3 (v3.47 and v3.48). If customer needs this feature, we recommend to use AS3 v3.46 or lower on BIGIP.
diff --git a/pkg/agent/as3/as3Manager.go b/pkg/agent/as3/as3Manager.go
@@ -39,7 +39,7 @@ const (
 	// 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      = "9"
+	defaultAS3Build      = "10"
 	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-9-cis.json"
+	as3SchemaFileName     = "as3-schema-3.48.0-10-cis.json"
 )
 
 var baseAS3Config = `{

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

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -127,7 +127,7 @@ const (
 	//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   = "9"
+	defaultAS3Build   = "10"
 	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-9.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
   "class": "AS3",
   "persist": true,
   "logLevel": "error",

diff --git a/pkg/test/configs/as3_route_cfgmap_declaration.json b/pkg/test/configs/as3_route_cfgmap_declaration.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-9.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
   "class": "AS3",
   "persist": true,
   "logLevel": "error",

diff --git a/pkg/test/configs/as3_route_declaration.json b/pkg/test/configs/as3_route_declaration.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-9.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
   "class": "AS3",
   "declaration": {
     "class": "ADC",

diff --git a/pkg/test/configs/as3_route_declaration_overridden.json b/pkg/test/configs/as3_route_declaration_overridden.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-9.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
   "class": "AS3",
   "declaration": {
     "class": "ADC",

diff --git a/pkg/test/configs/as3config_multi_cm_unified.json b/pkg/test/configs/as3config_multi_cm_unified.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-9.json",
+  "$schema": "https://raw.githubusercontent.com/F5Networks/f5-appsvcs-extension/master/schema/3.48.0/as3-schema-3.48.0-10.json",
   "class": "AS3",
   "declaration": {
     "class": "ADC",

diff --git a/schemas/as3-schema-3.48.0-9-cis.json → schemas/as3-schema-3.48.0-10-cis.json b/schemas/as3-schema-3.48.0-9-cis.json → schemas/as3-schema-3.48.0-10-cis.json
@@ -30509,6 +30509,7 @@
         },
         {
           "type": "object",
+          "description": "Name or path to monitor",
           "properties": {
             "bigip": {
               "title": "BIG-IP monitor",
@@ -34805,14 +34806,6 @@
           "format": "f5ip",
           "default": ""
         },
-        "targetPort": {
-          "title": "Port",
-          "description": "L4 port (if any) monitor should probe; if 0 (default) then pool member port",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 65535,
-          "default": 0
-        },
         "timeout": {
           "title": "Timeout",
           "description": "Time limit for node to respond (seconds)",
@@ -35827,6 +35820,21 @@
             "tag": "expand"
           }
         },
+        "targetAddress": {
+          "title": "Address",
+          "description": "IP address monitor should probe; if empty (default) then pool member address",
+          "type": "string",
+          "format": "f5ip",
+          "default": ""
+        },
+        "targetPort": {
+          "title": "Port",
+          "description": "L4 port (if any) monitor should probe; if 0 (default) then pool member port",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 65535,
+          "default": 0
+        },
         "timeout": {
           "title": "Timeout",
           "description": "Time limit for node to respond (seconds)",
@@ -36140,7 +36148,8 @@
       "properties": {
         "bigip": {
           "description": "Path to BIG-IP object",
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         }
       },
       "required": [