chore: ci and some renames from KGO to KO (#1686)

Author: programmer04

.github/ISSUE_TEMPLATE/---release.md

@@ -19,13 +19,13 @@ If the troubleshooting section does not contain the answer to the problem you en
 - [ ] Ensure that the `go.mod` file references an officially released version of `kong/kubernetes-configuration` instead of directly depending on the main branch version.
 - [ ] Ensure that all generators have run properly (e.g. `make generate manifests`) so that updates to things like CRDs are handled for the release, double check that all manifests from `config/samples/` still work as intended.
 - [ ] Ensure GitHub PAT is still valid (see [GitHub PAT](#github-pat) below).
-- [ ] Ask on the `team-k8s` Slack channel for granting the CI DockerHub account temporary permission to push images to the `kong/gateway-operator-oss` repository.
+- [ ] Ask on the `team-k8s` Slack channel for granting the CI DockerHub account temporary permission to push images to the `kong/kong-operator` repository.
 - [ ] From [GitHub release action][release-action], start a new workflow run:
   - Set the `Use workflow from` to the release branch: e.g. `release/1.2.x`
     - If you want to release a major version, set the `Use workflow from` to the `main` branch otherwise set it to the release branch.
   - Set the `release` input set to the target version (e.g. `v1.2.0`).
 - [ ] Wait for the workflow to complete.
-- [ ] Once the workflow completes, ask for revoking the temporary permission to push images to the `kong/gateway-operator-oss` repository.
+- [ ] Once the workflow completes, ask for revoking the temporary permission to push images to the `kong/kong-operator` repository.
 - [ ] The CI should create a PR in the [Gateway Operator][kgo-prs] repo that bumps KGO version in `VERSION` file and manifests. Merge it.
 - [ ] After the PR is merged, [release-bot][release-bot-workflow] workflow will be triggered. It will create a new GH release, as well as a release branch (if not patch or prerelease):
   - [ ] Check the [releases][releases] page. The release has to be marked manually as `latest` if this is the case.

.github/workflows/__release-workflow.yaml

@@ -227,7 +227,7 @@ jobs:
         run: make test.e2e
         env:
           KONG_LICENSE_DATA: ${{ steps.get-license.outputs.license || '' }} # The license is optional for OSS tests.
-          KONG_TEST_GATEWAY_OPERATOR_IMAGE_OVERRIDE: ${{ needs.build-push-images.outputs.full_tag }}
+          KONG_TEST_KONG_OPERATOR_IMAGE_OVERRIDE: ${{ needs.build-push-images.outputs.full_tag }}
           KONG_TEST_KONNECT_ACCESS_TOKEN: ${{ secrets.konnect-pat }}
           KONG_TEST_KONNECT_SERVER_URL: us.api.konghq.tech
 

.github/workflows/charts-tests.yaml

@@ -98,58 +98,60 @@ jobs:
             echo 'EOF'
           ) >> "${GITHUB_OUTPUT}"
 
-  lint-test:
-    timeout-minutes: 30
-    needs:
-      - check-docs-only
-      - matrix_k8s_node_versions
-    if: ${{ needs.check-docs-only.outputs.docs_only != 'true' }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        kubernetes-node-version: ${{ fromJson(needs.matrix_k8s_node_versions.outputs.matrix) }}
-        chart-name:
-          - kong-operator
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
-        with:
-          install: false
-
-      - uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
-
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.13"
-
-      - uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
-
-      - name: Run chart-testing (lint)
-        run: ct lint --target-branch main --check-version-increment=false
-
-      - name: setup testing environment (kind-cluster)
-        env:
-          KUBERNETES_VERSION: ${{ matrix.kubernetes-node-version }}
-          CHART_NAME: ${{ matrix.chart-name }}
-        run: ./scripts/charts-test-env.sh
-
-      - name: Install kubernetes-configuration CRDs (ingress-controller)
-        run: make install.kubernetes-configuration-crds-ingress-controller
-
-      - name: Install kubernetes-configuration CRDs (operator)
-        run: make install.kubernetes-configuration-crds-operator
-
-      - name: Install Gateway API CRDs
-        run: make install.gateway-api-crds
-
-      - name: Run chart-testing (install)
-        run: |
-          kubectl create ns kong-test
-          ct install --target-branch main --charts charts/${{ matrix.chart-name}} --namespace kong-test
-          # No need to delete the ns the cluster is scrapped after the job anyway.
+  #TODO: https://github.com/Kong/gateway-operator/issues/1717 
+  # See the line 184 too!
+  # lint-test:
+  #   timeout-minutes: 30
+  #   needs:
+  #     - check-docs-only
+  #     - matrix_k8s_node_versions
+  #   if: ${{ needs.check-docs-only.outputs.docs_only != 'true' }}
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       kubernetes-node-version: ${{ fromJson(needs.matrix_k8s_node_versions.outputs.matrix) }}
+  #       chart-name:
+  #         - kong-operator
+  #   steps:
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+  #       with:
+  #         fetch-depth: 0
+
+  #     - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+  #       with:
+  #         install: false
+
+  #     - uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
+
+  #     - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+  #       with:
+  #         python-version: "3.13"
+
+  #     - uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
+
+  #     - name: Run chart-testing (lint)
+  #       run: ct lint --target-branch main --check-version-increment=false
+
+  #     - name: setup testing environment (kind-cluster)
+  #       env:
+  #         KUBERNETES_VERSION: ${{ matrix.kubernetes-node-version }}
+  #         CHART_NAME: ${{ matrix.chart-name }}
+  #       run: ./scripts/charts-test-env.sh
+
+  #     - name: Install kubernetes-configuration CRDs (ingress-controller)
+  #       run: make install.kubernetes-configuration-crds-ingress-controller
+
+  #     - name: Install kubernetes-configuration CRDs (operator)
+  #       run: make install.kubernetes-configuration-crds-operator
+
+  #     - name: Install Gateway API CRDs
+  #       run: make install.gateway-api-crds
+
+  #     - name: Run chart-testing (install)
+  #       run: |
+  #         kubectl create ns kong-test
+  #         ct install --target-branch main --charts charts/${{ matrix.chart-name}} --namespace kong-test
+  #         # No need to delete the ns the cluster is scrapped after the job anyway.
 
   golden-tests:
     timeout-minutes: 30
@@ -179,7 +181,8 @@ jobs:
       - check-docs-only
       - generate
       - lint
-      - lint-test
+      #TODO: https://github.com/Kong/gateway-operator/issues/1717
+      # - lint-test
       - golden-tests
     if: always()
     steps:

.github/workflows/tests.yaml

@@ -161,7 +161,7 @@ jobs:
     needs: [check-docs-only]
     if: ${{ needs.check-docs-only.outputs.docs_only != 'true' }}
     env:
-      IMG: gateway-operator
+      IMG: kong-operator
       TAG: e2e-${{ github.sha }}
       CLUSTER_NAME: install-with-kustomize
     steps:
@@ -189,11 +189,11 @@ jobs:
       run: make install
 
     - name: Load image to kind cluster
-      run: kind load docker-image gateway-operator:e2e-${{ github.sha }} --name $CLUSTER_NAME
+      run: kind load docker-image kong-operator:e2e-${{ github.sha }} --name $CLUSTER_NAME
 
     - name: Verify deploying operator via kustomize works
       env:
-        IMG: gateway-operator
+        IMG: kong-operator
         VERSION: e2e-${{ github.sha }}
       run: make deploy
 
@@ -273,7 +273,7 @@ jobs:
 
     - name: Run the crds validation tests
       run: make test.crds-validation
-  
+
   envtest-tests:
     runs-on: ubuntu-latest
     needs: [check-docs-only]
@@ -456,7 +456,7 @@ jobs:
       with:
         name: tests-report-integration-bluegreen
         path: integration-tests-bluegreen.xml
-  
+
   e2e-tests:
     runs-on: ubuntu-latest
     needs: [check-docs-only]
@@ -474,7 +474,7 @@ jobs:
 
     - name: build docker image
       env:
-        IMG: gateway-operator
+        IMG: kong-operator
         TAG: e2e-${{ github.sha }}
       run: make docker.build
 
@@ -485,7 +485,7 @@ jobs:
     - name: run e2e tests
       run: make test.e2e
       env:
-        KONG_TEST_GATEWAY_OPERATOR_IMAGE_LOAD: gateway-operator:e2e-${{ github.sha }}
+        KONG_TEST_KONG_OPERATOR_IMAGE_LOAD: kong-operator:e2e-${{ github.sha }}
         GOTESTSUM_JUNITFILE: "e2e-tests.xml"
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -575,5 +575,3 @@ jobs:
             echo "Some jobs failed or were cancelled."
             exit 1
           fi
-
-

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Table of Contents
 
+- [v2.0.0-alpha.0](#v200-alpha0)
 - [v1.6.1](#v161)
 - [v1.6.0](#v160)
 - [v1.5.1](#v151)
@@ -28,7 +29,12 @@
 - [v0.1.1](#v011)
 - [v0.1.0](#v010)
 
-## Unreleased for Kong Operator
+## [v2.0.0-alpha.0]
+
+> Release date: 2025-06-11
+
+> KGO becomes KO, which stands for Kong Operator - Kubernetes Gateway Operator and Kubernetes Ingress Controller
+> become a single product.
 
 ### Added
 

Makefile

@@ -20,8 +20,8 @@ endif
 SHELL = bash
 .SHELLFLAGS = -ec -o pipefail
 
-IMG ?= docker.io/kong/gateway-operator-oss
-KUSTOMIZE_IMG_NAME = docker.io/kong/gateway-operator-oss
+IMG ?= docker.io/kong/kong-operator
+KUSTOMIZE_IMG_NAME = docker.io/kong/kong-operator
 
 ifeq (Darwin,$(shell uname -s))
 LDFLAGS_COMMON ?= -extldflags=-Wl,-ld_classic
@@ -719,9 +719,9 @@ _run.with-impersonate:
 	cp $(KUBECONFIG) $(TMP_KUBECONFIG)
 	@$(eval TMP_TOKEN := $(shell kubectl create token --namespace=kong-system controller-manager))
 	@$(eval CLUSTER := $(shell kubectl config get-contexts | grep '^\*' | tr -s ' ' | cut -d ' ' -f 3))
-	KUBECONFIG=$(TMP_KUBECONFIG) kubectl config set-credentials kgo --token=$(TMP_TOKEN)
-	KUBECONFIG=$(TMP_KUBECONFIG) kubectl config set-context kgo --cluster=$(CLUSTER) --user=kgo --namespace=kong-system
-	KUBECONFIG=$(TMP_KUBECONFIG) kubectl config use-context kgo
+	KUBECONFIG=$(TMP_KUBECONFIG) kubectl config set-credentials ko --token=$(TMP_TOKEN)
+	KUBECONFIG=$(TMP_KUBECONFIG) kubectl config set-context ko --cluster=$(CLUSTER) --user=kgo --namespace=kong-system
+	KUBECONFIG=$(TMP_KUBECONFIG) kubectl config use-context ko
 	$(MAKE) _run TMP_KUBECONFIG=$(TMP_KUBECONFIG)
 
 SKAFFOLD_RUN_PROFILE ?= dev

README.md

@@ -40,15 +40,15 @@ See our [Features Page](/FEATURES.md) for details on these capabilities.
 
 The operator provides 2 APIs:
 
-- YAML / manifests API which users use to apply their manifests against Kubernetes clusters.
-- Go API through types exported under [api/](https://github.com/Kong/gateway-operator/tree/main/api)
+* YAML / manifests API which users use to apply their manifests against Kubernetes clusters.
+* Go API through types exported under [api/](https://github.com/Kong/gateway-operator/tree/main/api)
   and other exported packages.
 
 This project:
 
-- Follows [Kubernetes API versioning][k8s_api_versioning] for the YAML API.
-  - This is considered part of the user contract.
-- Tries to not break users implementing against operator's Go API but does not
+* Follows [Kubernetes API versioning][k8s_api_versioning] for the YAML API.
+  * This is considered part of the user contract.
+* Tries to not break users implementing against operator's Go API but does not
   offer a non breaking guarantee.
 
 [k8s_api_versioning]: https://kubernetes.io/docs/reference/using-api/#api-versioning
@@ -63,21 +63,21 @@ detailed description of how to thoroughly use this project.
 
 ### Release images
 
-Release builds can be found on Docker Hub in [kong/gateway-operator-oss repository][dockerhub-kgo-oss].
+Release builds can be found on Docker Hub in [kong/kong-operator repository][dockerhub-ko].
 
 At the moment we're providing images for:
 
-- Linux `amd64`
-- Linux `arm64`
+* Linux `amd64`
+* Linux `arm64`
 
-[dockerhub-kgo-oss]: https://hub.docker.com/r/kong/gateway-operator-oss
+[dockerhub-ko]: https://hub.docker.com/r/kong/kong-operator
 
 ### `main` branch builds
 
 Nightly pre-release builds of the `main` branch are available from the
-[kong/nightly-gateway-operator-oss repository][dockerhub-kgo-nightly] hosted on Docker Hub.
+[kong/nightly-kong-operator repository][dockerhub-ko-nightly] hosted on Docker Hub.
 
-[dockerhub-kgo-nightly]: https://hub.docker.com/r/kong/nightly-gateway-operator-oss
+[dockerhub-ko-nightly]: https://hub.docker.com/r/kong/nightly-kong-operator
 
 ## Development
 
@@ -106,9 +106,10 @@ machine against the cluster that you have configured via your `KUBECONFIG`.
 ### Adding new CRDs
 
 Whenever you add a new CRD:
-- Ensure that it is included in project's [`PROJECT`](./PROJECT) file. This is necessary for creation of
+
+* Ensure that it is included in project's [`PROJECT`](./PROJECT) file. This is necessary for creation of
   a bundle for external hubs like [Operator Hub's community operators][community-operators].
-- Annotate the CRD and any new type it depends on with the right markers to make sure it will be included
+* Annotate the CRD and any new type it depends on with the right markers to make sure it will be included
   in the generated documentation. See [available markers][available-markers].
 
 [community-operators]: https://github.com/k8s-operatorhub/community-operators/

VERSION

@@ -1 +1 @@
-1.6.1
+2.0.0-alpha.0

charts/kong-operator/ci/__snapshots__/affinity-values.snap

@@ -673,7 +673,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: kgo
+    app.kubernetes.io/component: ko
   name: chartsnap-kong-operator
   namespace: default
 spec:
@@ -683,7 +683,7 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    app.kubernetes.io/component: kgo
+    app.kubernetes.io/component: ko
 ---
 # Source: kong-operator/templates/deployment.yaml
 apiVersion: apps/v1
@@ -694,15 +694,15 @@ metadata:
     helm.sh/chart: kong-operator-0.0.1
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/version: "2.0.0-alpha.0"
-    app.kubernetes.io/component: kgo
+    app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: kong-operator
-      app.kubernetes.io/component: kgo
+      app.kubernetes.io/component: ko
       app.kubernetes.io/instance: "chartsnap"
   strategy:
     type: Recreate
@@ -716,7 +716,7 @@ spec:
         helm.sh/chart: kong-operator-0.0.1
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/version: "2.0.0-alpha.0"
-        app.kubernetes.io/component: kgo
+        app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
         version: "2.0.0-alpha.0"
     spec:
@@ -743,7 +743,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: "docker.io/kong/gateway-operator:1.6"
+        image: "docker.io/kong/kong-operator:2.0.0-alpha.0"
         livenessProbe:
           httpGet:
             path: /healthz