From bf0e85893829c570fbeeebdee437a55ff00ebccc Mon Sep 17 00:00:00 2001 From: Vivek Lohiya Date: Mon, 7 Oct 2024 20:48:22 +0530 Subject: [PATCH] Upgrading the chart version --- .../customresourcedefinitions.yml | 131 ++++++++++-------- docs/upgradeProcess.md | 1 + helm-charts/f5-bigip-ctlr/Chart.yaml | 2 +- pkg/controller/resourceConfig.go | 29 ++-- 4 files changed, 91 insertions(+), 72 deletions(-) diff --git a/docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml b/docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml index 5f43608f6..8e33d1081 100644 --- a/docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml +++ b/docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml @@ -370,7 +370,7 @@ spec: maximum: 65535 serviceDownAction: type: string - extendedServiceReferences: + multiClusterServices: type: array items: type: object @@ -425,6 +425,10 @@ spec: status: type: string default: Pending + lastUpdated: + type: string + error: + type: string additionalPrinterColumns: - name: host type: string @@ -459,7 +463,7 @@ spec: jsonPath: .metadata.creationTimestamp subresources: status: {} - + --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -600,7 +604,7 @@ spec: policyName: type: string pattern: '^([A-z0-9-_+])*([A-z0-9])$' - mode: + mode: type: string enum: [standard, performance] type: @@ -741,32 +745,32 @@ spec: items: type: object properties: - type: - type: string - enum: [ tcp, udp, http, https ] - interval: - type: integer - timeout: - type: integer - targetPort: - type: integer - name: - type: string - pattern: '^\/[a-zA-Z]+([A-z0-9-_+]+\/)+([-A-z0-9_.:]+\/?)*$' - reference: - type: string - enum: [bigip] - send: - type: string - recv: - type: string + type: + type: string + enum: [ tcp, udp, http, https ] + interval: + type: integer + timeout: + type: integer + targetPort: + type: integer + name: + type: string + pattern: '^\/[a-zA-Z]+([A-z0-9-_+]+\/)+([-A-z0-9_.:]+\/?)*$' + reference: + type: string + enum: [bigip] + send: + type: string + recv: + type: string reselectTries: type: integer minimum: 0 maximum: 65535 serviceDownAction: type: string - extendedServiceReferences: + multiClusterServices: type: array items: type: object @@ -787,9 +791,11 @@ spec: type: integer minimum: 0 maximum: 100 - required: - - service - - servicePort + required: + - clusterName + - service + - namespace + - servicePort required: - virtualServerPort - pool @@ -806,38 +812,42 @@ spec: status: type: string default: Pending + lastUpdated: + type: string + error: + type: string 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: ipamLabel - type: string - description: ipamLabel for transport server - jsonPath: .spec.ipamLabel - - name: IPAMVSAddress - type: string - description: IP address of transport server - jsonPath: .status.vsAddress - - name: STATUS - type: string - description: status of TransportServer - jsonPath: .status.status - - 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: ipamLabel + type: string + description: ipamLabel for transport server + jsonPath: .spec.ipamLabel + - name: IPAMVSAddress + type: string + description: IP address of transport server + jsonPath: .status.vsAddress + - name: STATUS + type: string + description: status of TransportServer + jsonPath: .status.status + - name: Age + type: date + jsonPath: .metadata.creationTimestamp subresources: status: { } --- @@ -1027,6 +1037,13 @@ spec: properties: vsAddress: type: string + status: + type: string + default: pending + lastUpdated: + type: string + error: + type: string additionalPrinterColumns: - name: IPAMVSAddress type: string diff --git a/docs/upgradeProcess.md b/docs/upgradeProcess.md index f24cbfd85..06c773f1b 100644 --- a/docs/upgradeProcess.md +++ b/docs/upgradeProcess.md @@ -48,6 +48,7 @@ Compatibility Matrix | 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) | | v2.18.0 | v17.0 | v1.31 | v4.16.0* | Yes | Yes | v3.52 | v0.1.11 | v0.0.5 | v0.0.32 | Red Hat Enterprise Linux release 9.1 (Plow) | +| v2.18.1 | v17.0 | v1.31 | v4.16.0* | Yes | Yes | v3.52 | v0.1.11 | v0.0.5 | v0.0.33 | 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/helm-charts/f5-bigip-ctlr/Chart.yaml b/helm-charts/f5-bigip-ctlr/Chart.yaml index 69c7e16e4..da7511e1a 100644 --- 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.32 +version: 0.0.33 diff --git a/pkg/controller/resourceConfig.go b/pkg/controller/resourceConfig.go index 006d2c1ec..5958781dd 100644 --- a/pkg/controller/resourceConfig.go +++ b/pkg/controller/resourceConfig.go @@ -420,21 +420,22 @@ func (ctlr *Controller) formatMonitorNameForTS(namespace, svc string, monitorTyp } else { monitorName = fmt.Sprintf("%s_%s", svc, namespace) - if len(hostName) > 0 { - monitorName = monitorName + fmt.Sprintf("_%s", hostName) - } - if len(path) > 0 && path != "/" { - if path[0] == '/' { - monitorName = monitorName + fmt.Sprintf("%s", path) - } else { - monitorName = monitorName + fmt.Sprintf("_%s", path) + if len(hostName) > 0 { + monitorName = monitorName + fmt.Sprintf("_%s", hostName) + } + if len(path) > 0 && path != "/" { + if path[0] == '/' { + monitorName = monitorName + fmt.Sprintf("%s", path) + } else { + monitorName = monitorName + fmt.Sprintf("_%s", path) + } } - } - if monitorType != "" && (port.IntVal != 0 || port.StrVal != "") { - servicePort := fetchPortString(port) - monitorName = monitorName + fmt.Sprintf("_%s_%s", monitorType, servicePort) - }} + if monitorType != "" && (port.IntVal != 0 || port.StrVal != "") { + servicePort := fetchPortString(port) + monitorName = monitorName + fmt.Sprintf("_%s_%s", monitorType, servicePort) + } + } return AS3NameFormatter(monitorName) } @@ -922,7 +923,7 @@ func (ctlr *Controller) createTransportServerMonitor(monitor cisapiv1.Monitor, p } else { monitorName := monitor.Name if monitorName == "" { - monitorName = ctlr.formatMonitorNameForTS(vsNamespace, pool.ServiceName, monitor.Type, formatPort, "", "",hash) + monitorName = ctlr.formatMonitorNameForTS(vsNamespace, pool.ServiceName, monitor.Type, formatPort, "", "", hash) } pool.MonitorNames = append(pool.MonitorNames, MonitorName{Name: JoinBigipPath(rsCfg.Virtual.Partition, monitorName)})