Skip to content

Commit 1952a80

Browse files
authored
Operator changes for 2.5.0 release (#1900)
1 parent 1d220ab commit 1952a80

File tree

15 files changed

+331
-491
lines changed

15 files changed

+331
-491
lines changed

azure-pipelines.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variables:
1919
quayConnection: 'quay-bot'
2020
redhatConnection: 'redhat-bot'
2121
dockerConnection: 'docker-bot'
22-
scanConnection: 'scan-bot'
22+
scanConnection: 'cis-scan-bot'
2323
quay_path: 'quay.io/f5networks/k8s-bigip-ctlr-devel'
2424
redhat_prj_name: 'cntr-ingress-svcs'
2525
redhat_tag: '$(BUILD_VERSION)-rhel7'
@@ -39,11 +39,13 @@ steps:
3939
containerRegistry: $(quayConnection)
4040
- task: Docker@2
4141
displayName: Login to docker registry
42+
condition: startsWith(variables['build.sourceBranch'], 'refs/tags/')
4243
inputs:
4344
command: login
4445
containerRegistry: $(dockerConnection)
4546
- task: Docker@2
4647
displayName: Login to scan registry
48+
condition: startsWith(variables['build.sourceBranch'], 'refs/tags/')
4749
inputs:
4850
command: login
4951
containerRegistry: $(scanConnection)
@@ -62,7 +64,7 @@ steps:
6264
tags: $(Build.SourceVersion)
6365
arguments: "--build-arg BUILD_INFO=azure-$(Build.BuildId)-$(Build.SourceVersion) --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg RUN_TESTS=$(RUN_TESTS)"
6466
- task: Docker@2
65-
displayName: Push image to quay.io
67+
displayName: Push image to Quay
6668
inputs:
6769
command: push
6870
containerRegistry: $(quayConnection)
@@ -74,7 +76,7 @@ steps:
7476
podman tag $(quay_path):$(Build.SourceVersion) scan.connect.redhat.com/$(REDHAT_PRJ_ID)/$(redhat_prj_name):$(redhat_tag)
7577
podman push --authfile $(DOCKER_CONFIG)/config.json scan.connect.redhat.com/$(REDHAT_PRJ_ID)/$(redhat_prj_name):$(redhat_tag)
7678
condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/tags/'))
77-
displayName: 'Publish to Redhat'
79+
displayName: 'Push image to Redhat'
7880
continueOnError: true
7981
- script: |
8082
set -ex
@@ -88,5 +90,5 @@ steps:
8890
fi
8991
docker push $(docker_repo):latest
9092
docker push $(docker_repo):$(docker_version)
91-
displayName: 'Publish to DockerHub'
93+
displayName: 'Push image to DockerHub'
9294
condition: startsWith(variables['build.sourceBranch'], 'refs/tags/')

docs/RELEASE-NOTES.rst

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Added Functionality
1515
- Multiport Service and Health Monitor for Service type LoadBalancer in CRD mode. Refer for `examples <https://github.com/F5Networks/k8s-bigip-ctlr/tree/master/docs/config_examples/crd/serviceTypeLB>`_.
1616
- :issues:`1824` Support for Kubernetes networking.k8s.io/v1 Ingress and IngressClass. Refer for `examples <https://github.com/F5Networks/k8s-bigip-ctlr/tree/master/docs/config_examples/ingress/networkingV1>`_.
1717
- For networking.k8s.io/v1 Ingress, add multiple BIGIP SSL client profiles with annotation ``virtual-server.f5.com/clientssl``. Refer for `examples <https://github.com/F5Networks/k8s-bigip-ctlr/tree/master/docs/config_examples/ingress/networkingV1>`_.
18-
- OpenShift route annotations ``virtual-server.f5.com/rewrite-app-root`` (`examples <https://github.com/F5Networks/k8s-bigip-ctlr/blob/master/docs/config_examples/openshift/routes/sample-route-rewrite-app-root.yaml>`_) and ``virtual-server.f5.com/rewrite-target-url`` (`examples <https://github.com/F5Networks/k8s-bigip-ctlr/blob/master/docs/config_examples/openshift/routes/sample-route-rewrite-target-url.yaml>`_) with agent AS3.
18+
- OpenShift route annotations ``virtual-server.f5.com/rewrite-app-root`` (`examples <https://raw.githubusercontent.com/F5Networks/k8s-bigip-ctlr/master/docs/config_examples/openshift/routes/sample-route-rewrite-app-root.yaml>`_) and ``virtual-server.f5.com/rewrite-target-url`` (`examples <https://raw.githubusercontent.com/F5Networks/k8s-bigip-ctlr/master/docs/config_examples/openshift/routes/sample-route-rewrite-target-url.yaml>`_) with agent AS3.
1919
- :issues:`1570` iRule reference in TransportServer CRD. Refer for `examples <https://github.com/F5Networks/k8s-bigip-ctlr/tree/master/docs/config_examples/crd/TransportServer>`_.
2020
- CIS deployment configuration options:
2121
* ``--periodic-sync-interval`` - Configure the periodic sync of Kubernetes resources.
@@ -24,6 +24,11 @@ Added Functionality
2424
* CIS now monitors changes to Kubernetes Secret resource.
2525
* Improved performance while processing Ingress resources.
2626
* CIS in AS3 agent mode now adds default cipher groups to SSL profiles for TLS v1.3.
27+
* CIS now supports `F5 IPAM Controller 0.1.4 <https://github.com/F5Networks/f5-ipam-controller/blob/main/docs/RELEASE-NOTES.rst>`_.
28+
29+
* Helm Chart Enhancements includes:
30+
- Latest CRD schemas
31+
- IngressClass installation
2732

2833
Bugs Fixes
2934
``````````
@@ -36,14 +41,18 @@ Known Issues
3641

3742
Note
3843
````
39-
* CIS 2.5 supports Kubenetes networking.k8s.io/v1 Ingress and IngressClass. With Kubernetes > 1.18, update CIS ClusterRole (refer for `example <https://github.com/F5Networks/k8s-bigip-ctlr/blob/master/docs/config_examples/crd/Install/clusterrole.yml>`_) and create IngressClass (refer for `example <https://github.com/F5Networks/k8s-bigip-ctlr/blob/master/docs/config_examples/ingress/networkingV1/example-default-ingress-class.yaml>`_) before version upgrade.
44+
* CIS 2.5 supports Kubenetes networking.k8s.io/v1 Ingress and IngressClass. With Kubernetes > 1.18, update CIS ClusterRole (refer for `example <https://raw.githubusercontent.com/F5Networks/k8s-bigip-ctlr/master/docs/config_examples/crd/Install/clusterrole.yml>`_) and create IngressClass (refer for `example <https://raw.githubusercontent.com/F5Networks/k8s-bigip-ctlr/master/docs/config_examples/ingress/networkingV1/example-default-ingress-class.yaml>`_) before version upgrade.
45+
* To upgrade CIS using operator in OpenShift,
46+
- Install `IngressClass <https://raw.githubusercontent.com/F5Networks/k8s-bigip-ctlr/master/docs/config_examples/ingress/networkingV1/example-default-ingress-class.yaml>_` manually if CIS is monitoring ingress resource.
47+
- Install `CRDs <https://raw.githubusercontent.com/F5Networks/k8s-bigip-ctlr/master/docs/config_examples/crd/Install/customresourcedefinitions.yml>_` manually if using CIS CustomResources (VirtualServer/TransportServer/IngressLink).
48+
4049

4150
F5 IPAM Controller v0.1.4
4251
``````````````````````````
4352

4453
Added Functionality
4554
```````````````````
46-
* F5 IPAM Controller supports InfoBlox (Preview - Available for VirtualServer CRD only. See `documentation <https://github.com/F5Networks/f5-ipam-controller/blob/main/README.md>`_).
55+
* F5 IPAM Controller supports InfoBlox (Preview - Available for VirtualServer CR only. See `documentation <https://github.com/F5Networks/f5-ipam-controller/blob/main/README.md>`_).
4756

4857

4958
2.4.1

docs/config_examples/crd/IngressLink/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Create IngressLink Custom Resource definition as follows:
3737

3838
### 4. Install the Nginx Ingress Controller
3939

40-
* Refer to [Integration with F5 Container Ingress Services](https://github.com/nginxinc/kubernetes-ingress/blob/master/docs-web/f5-ingresslink.md) to deploy NGINX Ingress Controller
40+
* Refer to [Integration with F5 Container Ingress Services](https://docs.nginx.com/nginx-ingress-controller/f5-ingresslink/) to deploy NGINX Ingress Controller
4141

4242
### 5. Create an IngressLink Resource
4343

docs/config_examples/sample-rbac.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# for use in clusters using RBAC
22
kind: ClusterRole
3-
apiVersion: rbac.authorization.k8s.io/v1beta1
3+
apiVersion: rbac.authorization.k8s.io/v1
44
metadata:
55
name: bigip-ctlr-clusterrole
66
rules:
@@ -54,7 +54,7 @@ rules:
5454
---
5555

5656
kind: ClusterRoleBinding
57-
apiVersion: rbac.authorization.k8s.io/v1beta1
57+
apiVersion: rbac.authorization.k8s.io/v1
5858
metadata:
5959
name: bigip-ctlr-clusterrole-binding
6060
namespace: kube-system

operator/build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM quay.io/operator-framework/helm-operator:v1.6.4
1+
FROM quay.io/operator-framework/helm-operator:latest
22

33
### Required OpenShift Labels
44
LABEL name="F5 BIG-IP Controller Operator" \
55
vendor="F5 Networks Inc" \
6-
version="v1.7.0" \
6+
version="v1.8.0" \
77
release="1" \
88
summary="F5 BIG-IP Controller Operator" \
99
description="This operator will deploy F5 BIG-IP Controller for Kubernetes and OpenShift into the cluster."
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: v1
22
description: Deploy the F5 Networks BIG-IP Controller for Kubernetes and OpenShift (k8s-bigip-ctlr).
33
name: f5-bigip-ctlr
4-
version: 0.0.14
4+
version: 0.0.15

operator/helm-charts/f5-bigip-ctlr/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Parameter | Required | Description | Default
4343
----------|-------------|-------------|--------
4444
bigip_login_secret | Required | Secret that contains BIG-IP login credentials | f5-bigip-ctlr-login
4545
args.bigip_url | Required | The management IP for your BIG-IP device | **Required**, no default
46-
args.partition | Required | BIG-IP partition the CIS Controller will manage | f5-bigip-ctlr
46+
args.bigip_partition | Required | BIG-IP partition the CIS Controller will manage | f5-bigip-ctlr
4747
args.namespaces | Optional | List of Kubernetes namespaces which CIS will monitor | empty
4848
rbac.create | Optional | Create ClusterRole and ClusterRoleBinding | true
4949
serviceAccount.name | Optional | name of the ServiceAccount for CIS controller | f5-bigip-ctlr-serviceaccount
@@ -52,6 +52,7 @@ namespace | Optional | name of namespace CIS will use to create deployment and o
5252
image.user | Optional | CIS Controller image repository username | f5networks
5353
image.repo | Optional | CIS Controller image repository name | k8s-bigip-ctlr
5454
image.pullPolicy | Optional | CIS Controller image pull policy | Always
55+
image.pullSecrets | Optional | List of secrets of container registry to pull image | empty
5556
version | Optional | CIS Controller image tag | latest
5657
nodeSelector | Optional | dictionary of Node selector labels | empty
5758
tolerations | Optional | Array of labels | empty

operator/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-clusterrole.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if .Values.rbac.create -}}
22
kind: ClusterRole
3-
apiVersion: rbac.authorization.k8s.io/v1beta1
3+
apiVersion: rbac.authorization.k8s.io/v1
44
metadata:
55
name: {{ template "f5-bigip-ctlr.fullname" . }}
66
labels:
@@ -92,4 +92,5 @@ rules:
9292
resources:
9393
- customresourcedefinitions
9494
{{- end }}
95-
{{- end -}}
95+
{{- end -}}
96+

operator/helm-charts/f5-bigip-ctlr/templates/f5-bigip-ctlr-clusterrolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if .Values.rbac.create -}}
22
kind: ClusterRoleBinding
3-
apiVersion: rbac.authorization.k8s.io/v1beta1
3+
apiVersion: rbac.authorization.k8s.io/v1
44
metadata:
55
name: {{ template "f5-bigip-ctlr.fullname" . }}
66
namespace: {{ template "f5-bigip-ctlr.namespace" . }}

0 commit comments

Comments
 (0)