2.x multicluster enhancements stable (#3641)

* Updated the changes as per the configurable standards

* Updated the versions

* Update with the route_label

* Undone the indentation changes

* Added the correct version 1.20

* Added the correct version 1.20 indenta

* Added the correct version 1.20 latest

* Updated the double quotes in sample config

* corrected the json args

* Deleted the stale file

f5-bigip-ctlr-operator/Dockerfile

@@ -5,12 +5,12 @@ ENV HOME=/opt/helm
 
 ### Required OpenShift Labels
 LABEL name="F5 Container Ingress Services Operator" \
-      maintainer="[email protected]" \
-      vendor="F5 Networks Inc." \
-      version="v1.19.0" \
-      release="1" \
-      summary="Container Ingress Services Operator for F5 BIG-IP" \
-      description="F5 BIG-IP Controller Operator is a Service Operator which installs F5 BIG-IP Controller (Container Ingress Services) on Kubernetes and OpenShift platforms and respective supported versions."
+    maintainer="[email protected]" \
+    vendor="F5 Networks Inc." \
+    version="v1.20.0" \
+    release="1" \
+    summary="Container Ingress Services Operator for F5 BIG-IP" \
+    description="F5 BIG-IP Controller Operator is a Service Operator which installs F5 BIG-IP Controller (Container Ingress Services) on Kubernetes and OpenShift platforms and respective supported versions."
 
 # Required Licenses
 COPY f5-bigip-ctlr-operator/licenses /licenses

f5-bigip-ctlr-operator/bundle/manifests/f5-bigip-ctlr-operator.clusterserviceversion.yaml

@@ -13,17 +13,18 @@ metadata:
           "spec": {
             "args": {
               "agent": "as3",
-              "bigip_partition": "BIGIP_PARTITION",
-              "bigip_url": "BIGIP_IP_ADDRESS",
+              "bigip_partition": "<BIGIP_PARTITION>",
+              "bigip_url": "<BIGIP_IP_ADDRESS>",
               "insecure": true,
               "log_as3_response": true,
-              "log_level": "DEBUG_OR_INFO",
+              "log_level": "<DEBUG_OR_INFO>",
               "manage_routes": true,
-              "openshift_sdn_name": "/BIGIP_PARTITION/SDN_NAME",
-              "pool-member-type": "CLUSTER_OR_NODEPORT_OR_LOADBALANCER",
-              "route_vserver_addr": "IP_ADDRESS"
+              "openshift_sdn_name": "<BIGIP_PARTITION/SDN_NAME>",
+              "pool_member_type": "<CLUSTER_OR_NODEPORT_OR_LOADBALANCER>",
+              "route_vserver_addr": "<IP_ADDRESS>",
+              "route_label": "<F5TYPE>"
             },
-            "bigip_login_secret": "BIGIP_LOGIN_K8S_SECRET",
+            "bigip_login_secret": "<BIGIP_LOGIN_K8S_SECRET>",
             "image": {
               "pullPolicy": "Always",
               "repo": "k8s-bigip-ctlr",
@@ -66,7 +67,7 @@ metadata:
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
-  name: f5-bigip-ctlr-operator.v1.19.0
+  name: f5-bigip-ctlr-operator.v1.20.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -410,7 +411,7 @@ spec:
   minKubeVersion: 1.13.0
   provider:
     name: F5 Networks Inc.
-  version: 1.19.0
+  version: 1.20.0
   relatedImages:
     - name: cntr-ingress-svcs
       image: registry.connect.redhat.com/f5networks/cntr-ingress-svcs@sha256:7ee53dc08596d4078da5bdb8188f3eda337d44ca8a91976667f2612bf54f9948

f5-bigip-ctlr-operator/config/samples/cis_v1_f5bigipctlr.yaml

@@ -7,14 +7,15 @@ spec:
     log_as3_response: true
     manage_routes: true
     agent: as3
-    log_level: DEBUG_OR_INFO
-    route_vserver_addr: IP_ADDRESS
-    bigip_partition: BIGIP_PARTITION
-    openshift_sdn_name: /BIGIP_PARTITION/SDN_NAME
-    bigip_url: BIGIP_IP_ADDRESS
+    log_level: "<DEBUG_OR_INFO>"
+    route_vserver_addr: "<IP_ADDRESS>"
+    bigip_partition: "<BIGIP_PARTITION>"
+    openshift_sdn_name: "</BIGIP_PARTITION/SDN_NAME>"
+    bigip_url: "<BIGIP_IP_ADDRESS>"
     insecure: true
-    pool-member-type: CLUSTER_OR_NODEPORT_OR_LOADBALANCER
-  bigip_login_secret: BIGIP_LOGIN_K8S_SECRET
+    pool_member_type: "<CLUSTER_OR_NODEPORT_OR_LOADBALANCER>"
+    route_label: "<ROUTE_LABEL_F5TYPE>"
+  bigip_login_secret: "<BIGIP_LOGIN_K8S_SECRET>"
   image:
     pullPolicy: Always
     repo: k8s-bigip-ctlr
@@ -29,4 +30,4 @@ spec:
     create: false
     ingressClassName: f5
     defaultController: false
-  version: latest
+  version: latest