fixed typo in next-gen-route docs

Makefile

@@ -75,13 +75,13 @@ pre-build:
 prod-build: pre-build
 	@echo "Building with running tests..."
 
-	docker build --build-arg RUN_TESTS=1 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr:latest -f build-tools/Dockerfile.$(BASE_OS) .
+	docker build --platform linux/amd64 --build-arg RUN_TESTS=1 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr:latest -f build-tools/Dockerfile.$(BASE_OS) .
 
 prod-quick: prod-build-quick
 
 prod-build-quick: pre-build
 	@echo "Quick build without running tests..."
-	docker build --build-arg RUN_TESTS=0 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr:latest -f build-tools/Dockerfile.$(BASE_OS) .
+	docker build --platform linux/amd64 --build-arg RUN_TESTS=0 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr:latest -f build-tools/Dockerfile.$(BASE_OS) .
 
 dev-license: pre-build
 	@echo "Running with tests and licenses generated will be in all_attributions.txt..."
@@ -93,7 +93,7 @@ dev-license: pre-build
 
 debug: pre-build
 	@echo "Building with debug support..."
-	docker build --build-arg RUN_TESTS=0 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr-dbg:latest -f build-tools/Dockerfile.debug .
+	docker build --platform linux/amd64 --build-arg RUN_TESTS=0 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr-dbg:latest -f build-tools/Dockerfile.debug .
 
 
 fmt:
@@ -105,7 +105,7 @@ vet:
 	$(CURDIR)/build-tools/vet.sh
 
 devel-image:
-	docker build --build-arg RUN_TESTS=0 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr-devel:latest -f build-tools/Dockerfile.$(BASE_OS) .
+	docker build --platform linux/amd64 --build-arg RUN_TESTS=0 --build-arg BUILD_VERSION=$(BUILD_VERSION) --build-arg BUILD_INFO=$(BUILD_INFO) -t k8s-bigip-ctlr-devel:latest -f build-tools/Dockerfile.$(BASE_OS) .
 
 # Enable certain funtionalities only on a developer build
 dev-patch:
@@ -151,5 +151,5 @@ else
 endif
 
 crd-code-gen:
-	docker run --name crdcodegen -v $(PWD):/go/src/github.com/F5Networks/k8s-bigip-ctlr/v2 quay.io/f5networks/ciscrdcodegen:latest
+	docker run --platform linux/amd64 --name crdcodegen -v $(PWD):/go/src/github.com/F5Networks/k8s-bigip-ctlr/v3 quay.io/f5networks/ciscrdcodegen:v1
 	docker rm crdcodegen

azure-pipelines.yaml

@@ -32,12 +32,17 @@ variables:
   operatorImageName: 'f5networks/f5-cis-operator-devel'
   operatorBundleImageName: 'f5networks/f5-cis-operator-bundle-devel'
   operatorIndexImage: 'f5networks/f5-cis-operator-index-devel'
+  goVersion: 1.21.4
 
 stages:
 - stage: PreCheck
   jobs:
   - job: Preverification
     steps:
+    - task: GoTool@0
+      inputs:
+        version: $(goVersion)
+      displayName: Install Go 1.21.4
     - task: CmdLine@2
       displayName: Check Go format and Suspicious constructs
       inputs:
@@ -140,138 +145,3 @@ stages:
           mergeTestResults: true
           failTaskOnFailedTests: false
           testRunTitle: 'Trivy - Vulnerabilities Summary'
-- stage: Charts
-  dependsOn: PreCheck
-  jobs:
-  - job: BuildCharts
-    steps:
-    - script: |
-          git diff HEAD HEAD~ --name-only | grep "helm-charts/\|docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml"
-          if  [ $? == 0 ] ; then echo "##vso[task.setvariable variable=chartsUpdated]True"; fi
-          git diff HEAD HEAD~ --name-only | grep "helm-charts/\|docs/config_examples/rbac/clusterrole.yaml"
-          if  [ $? == 0 ] ; then echo "##vso[task.setvariable variable=chartsUpdated]True"; fi
-      displayName: Check Helm changes
-    - script: echo '##vso[task.setvariable variable=chartPath]stable'
-      displayName: "Set the helm chart release directory as stable if the Build.SourceBranch starts with 'refs/tags/' "
-      condition: startsWith(variables['build.sourceBranch'], 'refs/tags/')
-    - script: |
-          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-          chmod 700 get_helm.sh
-          ./get_helm.sh --version $helmVersion
-      displayName: Install Helm
-      failOnStderr: true
-      condition: and(succeeded(), or(startsWith(variables['build.sourceBranch'], 'refs/tags/'), eq(variables['chartsUpdated'], 'True')) )
-    - task: UsePythonVersion@0
-      displayName: Install Python
-      inputs:
-        versionSpec: '3.8'
-        addToPath: true
-        architecture: 'x64'
-      condition: and(succeeded(), or(startsWith(variables['build.sourceBranch'], 'refs/tags/'), eq(variables['chartsUpdated'], 'True')) )
-    - script: |
-        mkdir -p ./helm-charts/f5-bigip-ctlr/crds
-        cp ./docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml ./helm-charts/f5-bigip-ctlr/crds/f5-bigip-ctlr-customresourcedefinitions.yml
-        sed -i '/metadata:/r ./helm-charts/labels.txt' ./helm-charts/f5-bigip-ctlr/crds/f5-bigip-ctlr-customresourcedefinitions.yml
-        pip install --disable-pip-version-check -r ./build-tools/py-requirements.txt
-        python ./build-tools/helm-clusterrole-gen.py
-        helm lint --strict ./helm-charts/f5-bigip-ctlr --set 'args.bigip_url=https://example.com'
-        helm package ./helm-charts/f5-bigip-ctlr --destination .deploy/
-
-      displayName: Package Helm Chart
-      failOnStderr: true
-      condition: and(succeeded(), or(startsWith(variables['build.sourceBranch'], 'refs/tags/'), eq(variables['chartsUpdated'], 'True')) )
-    - script: |
-        set -ex
-        git clone --single-branch --branch gh-pages https://$(PAT)@github.com/$(chartOrganization)/$(chartRepoName).git /tmp/$(chartRepoName)
-        cp -rf .deploy/*.tgz /tmp/$(chartRepoName)/$(chartPath)/
-        pushd /tmp/$(chartRepoName)
-        git config user.email "[email protected]"
-        git config user.name "cisbotctlr"
-        helm repo index --url https://$(chartOrganization).github.io/$(chartRepoName)/$(chartPath) $(chartPath)
-        git add --all
-        git commit -m 'Updating charts for CIS Release v$(cat next-version.txt) and Build Info azure-$(Build.BuildId)-$(Build.SourceVersion) in $(chartPath)'
-        git push origin gh-pages
-        popd
-      displayName: Upload charts
-      condition: and(succeeded(), or(startsWith(variables['build.sourceBranch'], 'refs/tags/'), eq(variables['chartsUpdated'], 'True')) )
-- stage: Operator
-  dependsOn: PreCheck
-  jobs:
-  - job: BuildOperator
-    steps:
-    - script: |
-          git diff HEAD HEAD~ --name-only | grep "helm-charts/\|operator/"
-          if [ $? == 0 ] ; then echo "##vso[task.setvariable variable=operatorUpdated]True"; fi
-      displayName: Check Operator changes
-    - task: Docker@2
-      displayName: Login to quay registry
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-      inputs:
-        command: login
-        containerRegistry: $(quayConnection)
-    - task: Docker@2
-      displayName: Login to redhat registry
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-      inputs:
-        command: login
-        containerRegistry: $(redhatConnection)
-    - task: UsePythonVersion@0
-      displayName: Install Python
-      inputs:
-        versionSpec: '3.8'
-        addToPath: true
-        architecture: 'x64'
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-    - script: |
-        pip install --disable-pip-version-check -r ./build-tools/py-requirements.txt
-        python ./build-tools/helm-clusterrole-gen.py
-      displayName: 'Generate the ClusterRole file'
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-    - task: Docker@2
-      displayName: Build Operator Image for test
-      inputs:
-        command: build
-        containerRegistry: $(quayConnection)
-        repository: $(operatorImageName)
-        Dockerfile: f5-bigip-ctlr-operator/Dockerfile
-        buildContext: .
-        tags: $(Build.SourceVersion)
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-    - task: Docker@2
-      displayName: Push image to Quay for testing 
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-      inputs:
-        command: push
-        containerRegistry: $(quayConnection)
-        repository: $(operatorImageName)
-        tags: $(Build.SourceVersion)
-    - script: |
-        sed -i 's|registry.connect.redhat.com/f5networks/k8s-bigip-ctlr-operator:latest|quay.io/$(operatorImageName):$(Build.SourceVersion)|g' ./f5-bigip-ctlr-operator/bundle/manifests/f5-bigip-ctlr-operator.clusterserviceversion.yaml
-      displayName: 'Prepare the charts repo for bunding with operator'
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-    - task: Docker@2
-      displayName: Build Operator Bundle for test
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-      inputs:
-        command: build
-        containerRegistry: $(quayConnection)
-        repository: $(operatorBundleImageName)
-        Dockerfile: f5-bigip-ctlr-operator/bundle.Dockerfile
-        buildContext: f5-bigip-ctlr-operator
-        tags: $(Build.SourceVersion)
-    - task: Docker@2
-      displayName: Push Operator Bundle image to Quay for testing 
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-      inputs:
-        command: push
-        containerRegistry: $(quayConnection)
-        repository: $(operatorBundleImageName)
-        tags: $(Build.SourceVersion)
-    - script: |
-        wget http://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest-4.9/opm-linux.tar.gz
-        tar xvf opm-linux.tar.gz
-        ./opm index add --bundles quay.io/$(operatorBundleImageName):$(Build.SourceVersion) --tag quay.io/$(operatorIndexImage):$(Build.SourceVersion) 
-        podman push quay.io/$(operatorIndexImage):$(Build.SourceVersion)
-      displayName: Updating the operator index image
-      condition: and(succeeded(), eq(variables['operatorUpdated'], 'True'))
-

build-tools/Dockerfile.debian

@@ -1,4 +1,4 @@
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 ARG REPOPATH=$GOPATH/src/github.com/F5Networks/k8s-bigip-ctlr
 ARG RUN_TESTS
@@ -8,10 +8,12 @@ ARG BUILD_INFO
 
 WORKDIR $REPOPATH
 ENV GO111MODULE on
+ENV CGO_ENABLED=0
 COPY . .
 
 RUN $REPOPATH/build-tools/rel-build.sh
 
+
 FROM python:3.10-slim-buster
 
 ENV APPPATH /app

build-tools/Dockerfile.debug

@@ -1,4 +1,4 @@
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 ARG REPOPATH=$GOPATH/src/github.com/F5Networks/k8s-bigip-ctlr
 ARG RUN_TESTS
@@ -7,11 +7,12 @@ ARG BUILD_VERSION
 ARG BUILD_INFO
 
 WORKDIR $REPOPATH
+ENV CGO_ENABLED=0
 ENV GO111MODULE on
 COPY . .
 
 RUN $REPOPATH/build-tools/rel-build.sh && \
-    go install github.com/go-delve/delve/cmd/dlv@v1.20.1
+    go install github.com/go-delve/delve/cmd/dlv@v1.21.2
 
 FROM python:3.10-slim-buster
 

build-tools/Dockerfile.ubi

@@ -1,4 +1,4 @@
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 ARG REPOPATH=$GOPATH/src/github.com/F5Networks/k8s-bigip-ctlr
 ARG RUN_TESTS

build-tools/crdcodegen.Dockerfile

@@ -2,13 +2,13 @@ FROM golang:1.17
 
 ENV GO111MODULE on
 
-ENV PKGPATH /go/src/github.com/F5Networks/k8s-bigip-ctlr/v2
+ENV PKGPATH /go/src/github.com/F5Networks/k8s-bigip-ctlr/v3
 
 RUN mkdir -p ${GOPATH}/src/github.com/F5Networks \
-	&& mkdir -p ${GOPATH}/src/k8s.io \
-	&& go get -d k8s.io/code-generator@v0.20.4 \
-	&& go get -d k8s.io/apimachinery \
-	&& go get -d k8s.io/apiextensions-apiserver \
+	&& mkdir -p ${GOPATH}/src/k8s.io/ \
+	&& go get -d k8s.io/code-generator@v0.21.2 \
+	&& go get -d k8s.io/apimachinery@v0.21.2 \
+	&& go get -d k8s.io/apiextensions-apiserver@v0.21.2 \
 	&& cp -r ${GOPATH}/pkg/mod/k8s.io/api@* ${GOPATH}/src/k8s.io/api \
 	&& cp -r ${GOPATH}/pkg/mod/k8s.io/apiextensions-apiserver@* ${GOPATH}/src/k8s.io/apiextensions-apiserver \
 	&& cp -r ${GOPATH}/pkg/mod/k8s.io/apimachinery@* ${GOPATH}/src/k8s.io/apimachinery \
@@ -22,4 +22,4 @@ RUN mkdir -p ${GOPATH}/src/github.com/F5Networks \
 
 WORKDIR ${PKGPATH}
 
-ENTRYPOINT $GOPATH/src/k8s.io/code-generator/generate-groups-extra.sh allcustom "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client" "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis" cis:v1
+ENTRYPOINT $GOPATH/src/k8s.io/code-generator/generate-groups-extra.sh allcustom "github.com/F5Networks/k8s-bigip-ctlr/v3/config/client" "github.com/F5Networks/k8s-bigip-ctlr/v3/config/apis" cis:v1

build-tools/version-tool

@@ -169,8 +169,9 @@ class VersionInfo(object):
         self._ver_file = Version(data)
 
         if self._ver_file.pre or self._ver_file.build:
-            raise Exception("{} contains more than major.minor.patch"
-                            .format(version_file.name))
+            if self._ver_file.pre not in ["alpha","beta","rc"]:
+                raise Exception("{} contains more than major.minor.patch"
+                                .format(version_file.name))
         self._vers = {
             'major': self._ver_file.major,
             'minor': self._ver_file.minor,