Fix to enable ingressClass in CIS deployment (#3458)

* Fix to enable ingressClass in CIS deployment * Adding new annotations added for openshift 4.15
F5Networks · Jun 24, 2024 · 74fe592 · 74fe592
1 parent 27249a7
commit 74fe592
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst
@@ -18,6 +18,7 @@ Bug Fixes
 * `Issue 3424 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3424>`_: Static routes not added if a label not added to a namespace when --namespace-label used.
 * `Issue 3443 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3443>`_: Fix issue with IPAM IP allocation on resource recreation
 * `Issue 3406 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3406>`_: Upon deleting all the CRD resources, the default route domain of CIS-managed Partition resets to 0
+* `Issue 3405 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3405>`_: Fix Helm Chart does not enable ingressClass after creating it.
 
 Upgrade notes
 ``````````````

diff --git a/docs/config_examples/appsExample/SecuredApp/secured-service.yaml b/docs/config_examples/appsExample/SecuredApp/secured-service.yaml
@@ -12,4 +12,4 @@ spec:
       targetPort: 443
   selector:
     app: hello-world-app-443
-  type: ClusterIP
+  type: NodePort
diff --git a/docs/config_examples/appsExample/UnSecuredApp/unsecured-service.yaml b/docs/config_examples/appsExample/UnSecuredApp/unsecured-service.yaml
@@ -12,4 +12,4 @@ spec:
       targetPort: 8080
   selector:
     app: hello-world-app
-  type: ClusterIP
+  type: NodePort
diff --git a/docs/config_examples/ingress/networkingV1/example-ingress-class-name.yaml b/docs/config_examples/ingress/networkingV1/example-ingress-class-name.yaml
@@ -2,10 +2,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-  # Load balancing algorithm
-  virtual-server.f5.com/balance: "round-robin"
-  # Specify the port you want to handle requests
-  virtual-server.f5.com/http-port: "80"
+    # Load balancing algorithm
+    virtual-server.f5.com/balance: "round-robin"
+    # Specify the port you want to handle requests
+    virtual-server.f5.com/http-port: "80"
   name: k8s10
   namespace: default
 spec:

diff --git a/docs/upgradeProcess.md b/docs/upgradeProcess.md
@@ -45,8 +45,8 @@ Compatibility Matrix
 | 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.0     | v17.0          | v1.29              | v4.14.0*                                                      | Yes | Yes                | v3.50       | v0.1.9      | v0.0.4            | v0.0.29           | Red Hat Enterprise Linux release 9.1 (Plow)         |
 | v2.16.1     | v17.0          | v1.29              | v4.14.0*                                                      | Yes | Yes                | v3.50       | v0.1.10     | v0.0.4            | v0.0.29           | Red Hat Enterprise Linux release 9.1 (Plow)         |
-| v2.17.0     | v17.0          | v1.31              | v4.15.0*                                                      | Yes | Yes                | v3.50       | v0.1.11     | v0.0.5            | v0.0.30           | Red Hat Enterprise Linux release 9.1 (Plow)         |
-
+| v2.17.0     | v17.0          | v1.31              | v4.15.0*                                                      | Yes | Yes                | v3.50       | v0.1.10     | v0.0.5            | v0.0.30           | Red Hat Enterprise Linux release 9.1 (Plow)         |
+| v2.17.1     | v17.0          | v1.31              | v4.15.0*                                                      | Yes | Yes                | v3.50       | v0.1.10     | v0.0.5            | v0.0.31           | Red Hat Enterprise Linux release 9.1 (Plow)         |
 Note: For OCP version 4.12, CIS is compatible with IPv4 and dual stack IPv4.
 
 Compatibility Matrix for Multi Cluster Support

diff --git a/f5-bigip-ctlr-operator/bundle/manifests/f5-bigip-ctlr-operator.clusterserviceversion.yaml b/f5-bigip-ctlr-operator/bundle/manifests/f5-bigip-ctlr-operator.clusterserviceversion.yaml
@@ -56,6 +56,16 @@ metadata:
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/F5Networks/k8s-bigip-ctlr
     support: F5 Operators Team <[email protected]>
+    features.operators.openshift.io/disconnected: "true"
+    features.operators.openshift.io/fips-compliant: "false"
+    features.operators.openshift.io/proxy-aware: "false"
+    features.operators.openshift.io/tls-profiles: "false"
+    features.operators.openshift.io/token-auth-aws: "false"
+    features.operators.openshift.io/token-auth-azure: "false"
+    features.operators.openshift.io/token-auth-gcp: "false"
+    features.operators.openshift.io/cnf: "false"
+    features.operators.openshift.io/cni: "false"
+    features.operators.openshift.io/csi: "false"
   name: f5-bigip-ctlr-operator.v1.17.0
   namespace: placeholder
 spec:

diff --git a/helm-charts/f5-bigip-ctlr/Chart.yaml b/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.30
+version: 0.0.31
diff --git a/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-deploy.yaml b/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-deploy.yaml
@@ -97,6 +97,9 @@ spec:
         command:
         - /app/bin/k8s-bigip-ctlr
         args:
+{{- if .Values.ingressClass.ingressClassName }}
+        - --ingress-class={{ .Values.ingressClass.ingressClassName | default "f5" }}
+{{- end }}
         - --credentials-directory
         - /tmp/creds
         {{- $ns := .Values.args.namespaces }}