Operator changes for CIS v2.4 release (#1786)

F5Networks · Apr 20, 2021 · f6f3719 · f6f3719
1 parent 1153b7c
commit f6f3719
Show file tree

Hide file tree

Showing 9 changed files with 396 additions and 34 deletions.
diff --git a/operator/build/Dockerfile b/operator/build/Dockerfile
@@ -3,7 +3,7 @@ FROM quay.io/operator-framework/helm-operator:latest
 ### Required OpenShift Labels
 LABEL name="F5 BIG-IP Controller Operator" \
       vendor="F5 Networks Inc" \
-      version="v1.6.0" \
+      version="v1.7.0" \
       release="1" \
       summary="F5 BIG-IP Controller Operator" \
       description="This operator will deploy F5 BIG-IP Controller for Kubernetes and OpenShift into the cluster."

diff --git a/operator/deploy/crds/cis.f5.com_v1_f5bigipctlr_cr.yaml b/operator/deploy/crds/cis.f5.com_v1_f5bigipctlr_cr.yaml
@@ -3,7 +3,7 @@ kind: F5BigIpCtlr
 metadata:
   name: f5-server
 spec:
-  version: 2.3.0
+  version: 2.4.0
   args:
     log_as3_response: true
     manage_routes: true

diff --git a/operator/helm-charts/f5-bigip-ctlr/Chart.yaml b/operator/helm-charts/f5-bigip-ctlr/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: Deploy the F5 Networks BIG-IP Controller for Kubernetes and OpenShift (k8s-bigip-ctlr).
 name: f5-bigip-ctlr
-version: 0.0.12
+version: 0.0.13
diff --git a/operator/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-clusterrole.yaml b/operator/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-clusterrole.yaml
@@ -44,6 +44,7 @@ rules:
       - events
       - ingresses/status
       - routes/status
+      - services/status
   - verbs:
       - get
       - list
@@ -56,6 +57,7 @@ rules:
       - tlsprofiles
       - transportservers
       - externaldnss
+      - ingresslinks
 {{- if .Values.args.ipam }}
   - verbs:
       - get
@@ -68,6 +70,7 @@ rules:
       - fic.f5.com
     resources:
       - f5ipams
+      - f5ipams/status
   - verbs:
       - get
       - list

diff --git a/operator/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-customresourcedefinitions.yml b/operator/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-customresourcedefinitions.yml
@@ -28,7 +28,7 @@ spec:
                   pattern: '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$'
                 httpTraffic:
                   type: string
-                cidr:
+                ipamLabel:
                   type: string
                 snat:
                   type: string
@@ -49,6 +49,25 @@ spec:
                   type: array
                   items:
                     type: string
+                serviceAddress:
+                  type: array
+                  maxItems: 1
+                  items:
+                    type: object
+                    properties:
+                      arpEnabled:
+                        type: boolean
+                      icmpEcho:
+                        type: string
+                        enum: [enable, disable, selective]
+                      routeAdvertisement:
+                        type: string
+                        enum: [enable, disable, selective, always, any, all]
+                      spanningEnabled:
+                        type: boolean
+                      trafficGroup:
+                        type: string
+                        pattern: '^\/([A-z0-9-_+]+\/)*([A-z0-9]+\/?)*$'
                 pools:
                   type: array
                   items:
@@ -115,10 +134,10 @@ spec:
           type: string
           description: Http Traffic Termination
           jsonPath: .spec.httpTraffic
-        - name: cidr
+        - name: ipamLabel
           type: string
-          description: Subnet of virtual server
-          jsonPath: .spec.cidr
+          description: ipamLabel for virtual server
+          jsonPath: .spec.ipamLabel
         - name: virtualServerAddress
           type: string
           description: IP address of virtualServer
@@ -171,7 +190,7 @@ spec:
                     reference:
                       type: string
                   required:
-                    - clientSSL
+                    - termination
 
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -209,16 +228,40 @@ spec:
                 virtualServerName:
                   type: string
                   pattern: '^([A-z0-9-_+])*([A-z0-9])$'
-                mode:
+                mode: 
                   type: string
                   enum: [standard, performance]
+                type:
+                  type: string
+                  enum: [tcp, udp]
                 snat:
                   type: string
                 allowVlans:
                   items:
                     type: string
                     pattern: '^\/([A-z0-9-_+]+\/)*([A-z0-9-_]+\/?)*$'
                   type: array
+                ipamLabel:
+                  type: string
+                serviceAddress:
+                  type: array
+                  maxItems: 1
+                  items:
+                    type: object
+                    properties:
+                      arpEnabled:
+                        type: boolean
+                      icmpEcho:
+                        type: string
+                        enum: [enable, disable, selective]
+                      routeAdvertisement:
+                        type: string
+                        enum: [enable, disable, selective, always, any, all]
+                      spanningEnabled:
+                        type: boolean
+                      trafficGroup:
+                        type: string
+                        pattern: '^\/([A-z0-9-_+]+\/)*([A-z0-9]+\/?)*$'
                 pool:
                   type: object
                   properties:
@@ -234,7 +277,7 @@ spec:
                       properties:
                         type:
                           type: string
-                          enum: [tcp]
+                          enum: [tcp, udp]
                         interval:
                           type: integer
                         timeout:
@@ -243,32 +286,31 @@ spec:
                         - type
                         - interval
                   required:
-                    - service
-                    - servicePort
+                      - service
+                      - servicePort
               required:
-                - virtualServerAddress
                 - virtualServerPort
                 - pool
       additionalPrinterColumns:
-        - name: virtualServerAddress
-          type: string
-          description: IP address of virtualServer
-          jsonPath: .spec.virtualServerAddress
-        - name: virtualServerPort
-          type: integer
-          description: Port of virtualServer
-          jsonPath: .spec.virtualServerPort
-        - name: pool
-          type: string
-          description: Name of service
-          jsonPath: .spec.pool.service
-        - name: poolPort
-          type: string
-          description: Port of service
-          jsonPath: .spec.pool.servicePort
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
+      - name: virtualServerAddress
+        type: string
+        description: IP address of virtualServer
+        jsonPath: .spec.virtualServerAddress
+      - name: virtualServerPort
+        type: integer
+        description: Port of virtualServer
+        jsonPath: .spec.virtualServerPort
+      - name: pool
+        type: string
+        description: Name of service
+        jsonPath: .spec.pool.service
+      - name: poolPort
+        type: string
+        description: Port of service
+        jsonPath: .spec.pool.servicePort
+      - name: Age
+        type: date
+        jsonPath: .metadata.creationTimestamp
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -349,3 +391,43 @@ spec:
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: ingresslinks.cis.f5.com
+spec:
+  group: cis.f5.com
+  names:
+    kind: IngressLink
+    shortNames:
+      - il
+    singular: ingresslink
+    plural: ingresslinks
+  scope: Namespaced
+  versions:
+    -
+      name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                virtualServerAddress:
+                  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])$'
+                iRules:
+                  type: array
+                  items:
+                    type: string
+                selector:
+                  properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
diff --git a/...st/new-f5-bundle/1.7.0/manifests/f5-bigip-ctlr-operator.v1.7.0.clusterserviceversion.yaml b/...st/new-f5-bundle/1.7.0/manifests/f5-bigip-ctlr-operator.v1.7.0.clusterserviceversion.yaml
diff --git a/operator/manifest/new-f5-bundle/1.7.0/manifests/f5bigipctlrs.cis.f5.com.crd.yaml b/operator/manifest/new-f5-bundle/1.7.0/manifests/f5bigipctlrs.cis.f5.com.crd.yaml
@@ -0,0 +1,19 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: f5bigipctlrs.cis.f5.com
+spec:
+  group: cis.f5.com
+  names:
+    kind: F5BigIpCtlr
+    listKind: F5BigIpCtlrList
+    plural: f5bigipctlrs
+    singular: f5bigipctlr
+  scope: Namespaced
+  subresources:
+    status: {}
+  version: v1
+  versions:
+    - name: v1
+      served: true
+      storage: true
diff --git a/operator/manifest/new-f5-bundle/1.7.0/metadata/annotations.yaml b/operator/manifest/new-f5-bundle/1.7.0/metadata/annotations.yaml
@@ -0,0 +1,7 @@
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: beta
+  operators.operatorframework.io.bundle.channels.v1: beta
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: f5-bigip-ctlr-operator
diff --git a/operator/manifest/new-f5-bundle/Dockerfile b/operator/manifest/new-f5-bundle/Dockerfile
@@ -7,8 +7,8 @@ LABEL operators.operatorframework.io.bundle.package.v1=f5-bigip-ctlr-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=beta
 LABEL operators.operatorframework.io.bundle.channel.default.v1=beta
 
-COPY 1.6.0/manifests /manifests/
-COPY 1.6.0/metadata /metadata/
+COPY 1.7.0/manifests /manifests/
+COPY 1.7.0/metadata /metadata/
 LABEL com.redhat.openshift.versions="v4.5,v4.6"
 LABEL com.redhat.delivery.backport=true
 LABEL com.redhat.delivery.operator.bundle=true