Merge 0e35de2 into 9f78233

cmd/k8s-bigip-ctlr/main.go

@@ -123,7 +123,7 @@ func _init() {
 		"Optional, filepath to store the CIS logs")
 	printVersion = globalFlags.Bool("version", false,
 		"Optional, print version and exit.")
-	disableTeems = globalFlags.Bool("disable-teems", false,
+	disableTeems = globalFlags.Bool("disable-teems", true,
 		"Optional, flag to disable sending telemetry data to TEEM")
 	useNodeInternal = kubeFlags.Bool("use-node-internal", true,
 		"Optional, provide kubernetes InternalIP addresses to pool")

config/apis/cis/v1/types.go

@@ -501,7 +501,6 @@ type AS3Config struct {
 
 type BigIpConfig struct {
 	BigIpAddress     string `json:"bigIpAddress,omitempty"`
-	HaBigIpAddress   string `json:"haBigIpAddress,omitempty"`
 	BigIpLabel       string `json:"bigIpLabel,omitempty"`
 	DefaultPartition string `json:"defaultPartition,omitempty"`
 }

docs/cis-3.x/deploy-config/cis-deploy-config-cr.yaml

@@ -8,21 +8,27 @@ metadata:
     f5cr: "true"
 spec:
   baseConfig:
+    # namespaceLabel is used to define the namespces which can be monitored by CIS
     namespaceLabel: controller=cis
     nodeLabel: controller=cis
+    # controllerIdentifier is used to identify the unique CIS cluster/instance
     controllerIdentifier: cluster-1
   networkConfig:
     orchestrationCNI: ovn-k8s
     metaData:
+      # poolMemberType is optional parameter, and it is used to specify the pool member type in CIS default value is nodeport
+      # allowed values are auto, cluster, nodeport and nodeportlocal
       poolMemberType: cluster
+      # network CIDR is optional parameter and required if your nodes are using multiple network interfaces
       networkCIDR: "10.1.0.0/16"
       staticRoutingMode: true
   as3Config:
+    # debugAS3 is a optional parameter, and it is used to enable the debug logs for AS3
     debugAS3: true
+    # post delay is a optional parameter, and it is used if AS3 is taking more time to apply the configuration
     postDelayAS3: 10
-    documentAPI: true
   bigIpConfig:
     - bigIpAddress: 10.10.10.1
-      haBigIpAddress: 10.10.10.2
+      # bigIpLabel is used to map the ingress resource to the bigip, you can specify the bigip label in TS/IngressLink CR
       bigIpLabel: Hyderabad
       defaultPartition: test

docs/cis-3.x/install/k8s/sample-k8s-bigip-ctlr.yaml

@@ -60,8 +60,6 @@ spec:
             "--deploy-config-cr=kube-system/cis-config",
             "--manage-custom-resources=true",
             "--credentials-directory=/tmp/creds",
-            "--disable-teems=true",
-            "--kubeconfig=/tmp/kubeconfig",
             "--log-level=INFO",
             "--no-verify-ssl=true"
           ]

docs/config_examples/customResourceDefinitions/incubator/customresourcedefinitions.yml

@@ -1122,9 +1122,6 @@ spec:
                     postDelayAS3:
                       type: integer
                       description: "time (in seconds) that CIS waits to post the available AS3 declaration to BIG-IP"
-                    documentAPI:
-                      type: boolean
-                      description: "documentAPI is used to enable or disable using centralmanager's two step deployment for AS3"
                   type: object
                   description: AS3 Configuration for CIS
                 baseConfig:
@@ -1180,10 +1177,6 @@ spec:
                       bigIpLabel:
                         type: string
                         description: "To uniquely identify bigip ha pair"
-                      haBigIpAddress:
-                        type: string
-                        pattern: '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$'
-                        description: "IP address of bigip HA instance"
                       defaultPartition:
                         type: string
                         description: "partition for the Big-IP kubernetes objects"

pkg/controller/worker.go

@@ -675,9 +675,6 @@ func (ctlr *Controller) processResources() bool {
 func getBigIpList(config cisapiv1.BigIpConfig) []BigIpKey {
 	var bigIpList []BigIpKey
 	bigIpList = append(bigIpList, BigIpKey{BigIpAddress: config.BigIpAddress, BigIpLabel: config.BigIpLabel})
-	if config.HaBigIpAddress != "" {
-		bigIpList = append(bigIpList, BigIpKey{BigIpAddress: config.HaBigIpAddress, BigIpLabel: config.BigIpLabel})
-	}
 	return bigIpList
 }