Skip to content

Commit

Permalink
Upgrading the chart version
Browse files Browse the repository at this point in the history
  • Loading branch information
@vklohiya
vklohiya committed Oct 7, 2024
1 parent 628ee3d commit bf0e858
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 72 deletions.
131 changes: 74 additions & 57 deletions docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ spec:
maximum: 65535
serviceDownAction:
type: string
extendedServiceReferences:
multiClusterServices:
type: array
items:
type: object
Expand Down Expand Up @@ -425,6 +425,10 @@ spec:
status:
type: string
default: Pending
lastUpdated:
type: string
error:
type: string
additionalPrinterColumns:
- name: host
type: string
Expand Down Expand Up @@ -459,7 +463,7 @@ spec:
jsonPath: .metadata.creationTimestamp
subresources:
status: {}

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -600,7 +604,7 @@ spec:
policyName:
type: string
pattern: '^([A-z0-9-_+])*([A-z0-9])$'
mode:
mode:
type: string
enum: [standard, performance]
type:
Expand Down Expand Up @@ -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
Expand All @@ -787,9 +791,11 @@ spec:
type: integer
minimum: 0
maximum: 100
required:
- service
- servicePort
required:
- clusterName
- service
- namespace
- servicePort
required:
- virtualServerPort
- pool
Expand All @@ -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: { }
---
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/upgradeProcess.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/f5-bigip-ctlr/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
29 changes: 15 additions & 14 deletions pkg/controller/resourceConfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)})
Expand Down

0 comments on commit bf0e858

Please sign in to comment.