k8stopo: Remove the deprecated Kubernetes topo (#13303)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

Author: dbussink

.golangci.yml

@@ -1,8 +1,6 @@
 run:
-  go: 1.19
+  go: 1.20
   timeout: 10m
-  skip-dirs:
-    - go/vt/topo/k8stopo/client
 
 linters-settings:
   errcheck:

Makefile

@@ -380,64 +380,6 @@ minimaltools:
 dependency_check:
 	./tools/dependency_check.sh
 
-install_k8s-code-generator: tools/tools.go go.mod
-	go install k8s.io/code-generator/cmd/deepcopy-gen
-	go install k8s.io/code-generator/cmd/client-gen
-	go install k8s.io/code-generator/cmd/lister-gen
-	go install k8s.io/code-generator/cmd/informer-gen
-
-DEEPCOPY_GEN=$(VTROOTBIN)/deepcopy-gen
-CLIENT_GEN=$(VTROOTBIN)/client-gen
-LISTER_GEN=$(VTROOTBIN)/lister-gen
-INFORMER_GEN=$(VTROOTBIN)/informer-gen
-
-GEN_BASE_DIR ?= vitess.io/vitess/go/vt/topo/k8stopo
-
-client_go_gen: install_k8s-code-generator
-	echo $$(date): Regenerating client-go code
-	# Delete and re-generate the deepcopy types
-	find $(VTROOT)/go/vt/topo/k8stopo/apis/topo/v1beta1 -name "zz_generated.deepcopy.go" -delete
-
-	# We output to ./ and then copy over the generated files to the appropriate path
-	# This is done so we don't have rely on the repository being cloned to `$GOPATH/src/vitess.io/vitess`
-
-	$(DEEPCOPY_GEN) -o ./ \
-	--input-dirs $(GEN_BASE_DIR)/apis/topo/v1beta1 \
-	-O zz_generated.deepcopy \
-	--bounding-dirs $(GEN_BASE_DIR)/apis \
-	--go-header-file ./go/vt/topo/k8stopo/boilerplate.go.txt
-
-	# Delete existing code
-	rm -rf go/vt/topo/k8stopo/client
-
-	# Generate clientset
-	$(CLIENT_GEN) -o ./ \
-	--clientset-name versioned \
-	--input-base $(GEN_BASE_DIR)/apis \
-	--input 'topo/v1beta1' \
-	--output-package $(GEN_BASE_DIR)/client/clientset \
-	--fake-clientset=true \
-	--go-header-file ./go/vt/topo/k8stopo/boilerplate.go.txt
-
-	# Generate listers
-	$(LISTER_GEN) -o ./ \
-	--input-dirs $(GEN_BASE_DIR)/apis/topo/v1beta1 \
-	--output-package $(GEN_BASE_DIR)/client/listers \
-	--go-header-file ./go/vt/topo/k8stopo/boilerplate.go.txt
-
-	# Generate informers
-	$(INFORMER_GEN) -o ./ \
-	--input-dirs $(GEN_BASE_DIR)/apis/topo/v1beta1 \
-	--output-package $(GEN_BASE_DIR)/client/informers \
-	--versioned-clientset-package $(GEN_BASE_DIR)/client/clientset/versioned \
-	--listers-package $(GEN_BASE_DIR)/client/listers \
-	--go-header-file ./go/vt/topo/k8stopo/boilerplate.go.txt
-
-	# Move and cleanup
-	mv vitess.io/vitess/go/vt/topo/k8stopo/client go/vt/topo/k8stopo/
-	mv vitess.io/vitess/go/vt/topo/k8stopo/apis/topo/v1beta1/zz_generated.deepcopy.go go/vt/topo/k8stopo/apis/topo/v1beta1/zz_generated.deepcopy.go
-	rm -rf vitess.io/vitess/go/vt/topo/k8stopo/
-
 vtadmin_web_install:
 	cd web/vtadmin && npm install
 

bootstrap.sh

@@ -171,35 +171,6 @@ install_etcd() {
   ln -snf "$dist/etcd-${version}-${platform}-${target}/etcdctl" "$VTROOT/bin/etcdctl"
 }
 
-
-# Download and install k3s, link k3s binary into our root
-install_k3s() {
-  local version="$1"
-  local dist="$2"
-  case $(uname) in
-    Linux)  local platform=linux;;
-    *)   echo "WARNING: unsupported platform. K3s only supports running on Linux, the k8s topology will not be available for local examples."; return;;
-  esac
-
-  case $(get_arch) in
-      aarch64)  local target="-arm64";;
-      x86_64) local target="";;
-      arm64)  local target="-arm64";;
-      *)   echo "WARNING: unsupported architecture, the k8s topology will not be available for local examples."; return;;
-  esac
-
-  file="k3s${target}"
-
-  local dest="$dist/k3s${target}-${version}-${platform}"
-  # This is how we'd download directly from source:
-  # download_url=https://github.com/rancher/k3s/releases/download
-  # wget -O  $dest "$download_url/$version/$file"
-  "${VTROOT}/tools/wget-retry" -O $dest "${VITESS_RESOURCES_DOWNLOAD_URL}/$file-$version"
-  chmod +x $dest
-  ln -snf  $dest "$VTROOT/bin/k3s"
-}
-
-
 # Download and install consul, link consul binary into our root.
 install_consul() {
   local version="$1"
@@ -299,9 +270,6 @@ install_all() {
   # etcd
   install_dep "etcd" "v3.5.6" "$VTROOT/dist/etcd" install_etcd
 
-  # k3s
-  command -v k3s || install_dep "k3s" "v1.0.0" "$VTROOT/dist/k3s" install_k3s
-
   # consul
   if [ "$BUILD_CONSUL" == 1 ] ; then
     install_dep "Consul" "1.11.4" "$VTROOT/dist/consul" install_consul

changelog/18.0/18.0.0/summary.md

@@ -7,6 +7,7 @@
   - **[New command line flags and behavior](#new-flag)**
     - [VTOrc flag `--allow-emergency-reparent`](#new-flag-toggle-ers)
   - **[Deprecations and Deletions](#deprecations-and-deletions)**
+    - [Deleted `k8stopo`](#deleted-k8stopo)
 
 
 ## <a id="major-changes"/>Major Changes
@@ -22,3 +23,7 @@ The users that want VTOrc to fix the replication issues, but don't want it to ru
 By default, VTOrc will be able to run `EmergencyReparentShard`. The users must specify the flag to `false` to change the behaviour.
 
 ### <a id="deprecations-and-deletions"/>Deprecations and Deletions
+
+#### <a id="deleted-k8stopo"/>Deleted `k8stopo`
+
+The `k8stopo` has been deprecated in Vitess 17, also see https://github.com/vitessio/vitess/issues/13298. With Vitess 18 the `k8stopo` has been removed.

examples/backups/start_cluster.sh

@@ -22,8 +22,6 @@ source ../common/env.sh
 # start topo server
 if [ "${TOPO}" = "zk2" ]; then
 	CELL=zone1 ../common/scripts/zk-up.sh
-elif [ "${TOPO}" = "k8s" ]; then
-	CELL=zone1 ../common/scripts/k3s-up.sh
 else
 	CELL=zone1 ../common/scripts/etcd-up.sh
 fi

examples/common/env.sh

@@ -56,13 +56,6 @@ if [ "${TOPO}" = "zk2" ]; then
     TOPOLOGY_FLAGS="--topo_implementation zk2 --topo_global_server_address ${ZK_SERVER} --topo_global_root /vitess/global"
 
     mkdir -p "${VTDATAROOT}/tmp"
-elif [ "${TOPO}" = "k8s" ]; then
-    # Set topology environment parameters.
-    K8S_ADDR="localhost"
-    K8S_PORT="8443"
-    K8S_KUBECONFIG=$VTDATAROOT/tmp/k8s.kubeconfig
-    # shellcheck disable=SC2034
-    TOPOLOGY_FLAGS="--topo_implementation k8s --topo_k8s_kubeconfig ${K8S_KUBECONFIG} --topo_global_server_address ${K8S_ADDR}:${K8S_PORT} --topo_global_root /vitess/global"
 elif [ "${TOPO}" = "consul" ]; then
     # Set up topology environment parameters.
     CONSUL_SERVER=127.0.0.1

examples/common/scripts/k3s-down.sh

@@ -31,8 +31,6 @@ SIDECAR_DB_NAME=${SIDECAR_DB_NAME:-"_vt"}
 # start topo server
 if [ "${TOPO}" = "zk2" ]; then
 	CELL=zone1 ../common/scripts/zk-up.sh
-elif [ "${TOPO}" = "k8s" ]; then
-	CELL=zone1 ../common/scripts/k3s-up.sh
 elif [ "${TOPO}" = "consul" ]; then
 	CELL=zone1 ../common/scripts/consul-up.sh
 else

examples/common/scripts/k3s-up.sh

@@ -42,8 +42,6 @@ done
 
 if [ "${TOPO}" = "zk2" ]; then
 	CELL=zone1 ../common/scripts/zk-down.sh
-elif [ "${TOPO}" = "k8s" ]; then
-	CELL=zone1 ../common/scripts/k3s-down.sh
 elif [ "${TOPO}" = "consul" ]; then
 	CELL=zone1 ../common/scripts/consul-down.sh
 else