OCPCLOUD-3094: Merge https://github.com/kubernetes/cloud-provider-gcp:master (4bc9861) into main

WORKSPACE

@@ -98,10 +98,10 @@ load("//defs:repo_rules.bzl", "fetch_kube_release")
 fetch_kube_release(
     name = "io_k8s_release",
     archives = {
-        "kubernetes-node-linux-amd64.tar.gz": "d9bb696806691697cee7b76fb51ca3c7746eafed9c021af2794a5aef8b4778f5",
-        "kubernetes-manifests.tar.gz": "1fb63926b6aafe6da1bd98122cf54986be771f12f13bd8537ff35d0331b06691",
-        "kubernetes-server-linux-amd64.tar.gz": "3e1f74decd5d653b35082539a4ce04c8497a2adcc126c51238a0382082eb92d8",
-        "kubernetes-node-windows-amd64.tar.gz": "03c7eb36cb11b1b1eca4bab273d0532155e3b822f335055284a7874cac0f39af",
+        "kubernetes-node-linux-amd64.tar.gz": "c615e5f29bf734b44a98906a0d03409547070a6659aa200af0072af383f03069",
+        "kubernetes-manifests.tar.gz": "b2dbc31a1abe571489cf1328e2cd1b56fd392c52b8fa52ea949829cf26bc545f",
+        "kubernetes-server-linux-amd64.tar.gz": "5b4b56cdcaaa1f388deb8114ecaae93c93a12cb81ecb5486d0cf67b33d3438e6",
+        "kubernetes-node-windows-amd64.tar.gz": "4da000b4f8fabc8035ca69b745e0893545bf5b8972ce3e4d07a6bc3d6985a151",
     },
-    version = "v1.33.1",
+    version = "v1.34.1",
 )

cluster/addons/dns/coredns/coredns.yaml.base

@@ -133,7 +133,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: registry.k8s.io/coredns/coredns:v1.12.0
+        image: registry.k8s.io/coredns/coredns:v1.12.1
         imagePullPolicy: IfNotPresent
         resources:
           limits:

cluster/addons/dns/coredns/coredns.yaml.in

@@ -133,7 +133,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: registry.k8s.io/coredns/coredns:v1.12.0
+        image: registry.k8s.io/coredns/coredns:v1.12.1
         imagePullPolicy: IfNotPresent
         resources:
           limits:

cluster/addons/dns/coredns/coredns.yaml.sed

@@ -133,7 +133,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: registry.k8s.io/coredns/coredns:v1.12.0
+        image: registry.k8s.io/coredns/coredns:v1.12.1
         imagePullPolicy: IfNotPresent
         resources:
           limits:

cluster/addons/dns/kube-dns/kube-dns.yaml.base

@@ -114,7 +114,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: kubedns
-        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.26.4
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
           runAsUser: 1001
           runAsGroup: 1001
       - name: dnsmasq
-        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.26.4
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -216,7 +216,7 @@ spec:
               - NET_BIND_SERVICE
               - SETGID
       - name: sidecar
-        image: registry.k8s.io/dns/k8s-dns-sidecar:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-sidecar:1.26.4
         livenessProbe:
           httpGet:
             path: /metrics

cluster/addons/dns/kube-dns/kube-dns.yaml.in

@@ -114,7 +114,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: kubedns
-        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.26.4
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
           runAsUser: 1001
           runAsGroup: 1001
       - name: dnsmasq
-        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.26.4
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -216,7 +216,7 @@ spec:
               - NET_BIND_SERVICE
               - SETGID
       - name: sidecar
-        image: registry.k8s.io/dns/k8s-dns-sidecar:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-sidecar:1.26.4
         livenessProbe:
           httpGet:
             path: /metrics

cluster/addons/dns/kube-dns/kube-dns.yaml.sed

@@ -114,7 +114,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: kubedns
-        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.26.4
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
           runAsUser: 1001
           runAsGroup: 1001
       - name: dnsmasq
-        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.26.4
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -216,7 +216,7 @@ spec:
               - NET_BIND_SERVICE
               - SETGID
       - name: sidecar
-        image: registry.k8s.io/dns/k8s-dns-sidecar:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-sidecar:1.26.4
         livenessProbe:
           httpGet:
             path: /metrics

cluster/addons/dns/nodelocaldns/nodelocaldns.yaml

@@ -138,7 +138,7 @@ spec:
         operator: "Exists"
       containers:
       - name: node-cache
-        image: registry.k8s.io/dns/k8s-dns-node-cache:1.25.0
+        image: registry.k8s.io/dns/k8s-dns-node-cache:1.26.4
         resources:
           requests:
             cpu: 25m

cluster/addons/node-problem-detector/npd.yaml

@@ -30,24 +30,24 @@ metadata:
   namespace: kube-system
   labels:
     app.kubernetes.io/name: node-problem-detector
-    app.kubernetes.io/version: v0.8.20
+    app.kubernetes.io/version: v0.8.21
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: node-problem-detector
-      app.kubernetes.io/version: v0.8.20
+      app.kubernetes.io/version: v0.8.21
   template:
     metadata:
       labels:
         app.kubernetes.io/name: node-problem-detector
-        app.kubernetes.io/version: v0.8.20
+        app.kubernetes.io/version: v0.8.21
     spec:
       nodeSelectors:
         kubernetes.io/os: linux
       containers:
       - name: node-problem-detector
-        image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.20
+        image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.21
         command:
         - "/bin/sh"
         - "-c"

cluster/gce/config-common.sh

@@ -136,7 +136,7 @@ export WINDOWS_CNI_CONFIG_DIR="${WINDOWS_K8S_DIR}\cni\config"
 # CNI storage path for Windows nodes
 export WINDOWS_CNI_STORAGE_PATH="https://github.com/containernetworking/plugins/releases/download"
 # CNI version for Windows nodes
-export WINDOWS_CNI_VERSION="v1.6.2"
+export WINDOWS_CNI_VERSION="v1.7.1"
 # Pod manifests directory for Windows nodes on Windows nodes.
 export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests"
 # Directory where cert/key files will be stores on Windows nodes.

cluster/gce/gci/configure-helper.sh

@@ -1829,15 +1829,6 @@ function prepare-kube-proxy-manifest-variables {
     kube_watchlist_inconsistency_detector_env_name="- name: KUBE_WATCHLIST_INCONSISTENCY_DETECTOR"
     kube_watchlist_inconsistency_detector_env_value="value: \"${ENABLE_KUBE_WATCHLIST_INCONSISTENCY_DETECTOR}\""
   fi
-  local kube_list_from_cache_inconsistency_detector_env_name=""
-  local kube_list_from_cache_inconsistency_detector_env_value=""
-  if [[ -n "${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR:-}" ]]; then
-    if [[ -z "${container_env}" ]]; then
-      container_env="env:"
-    fi
-    kube_list_from_cache_inconsistency_detector_env_name="- name: KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR"
-    kube_list_from_cache_inconsistency_detector_env_value="value: \"${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR}\""
-  fi
   sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" "${src_file}"
   sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" "${src_file}"
   sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" "${src_file}"
@@ -1849,8 +1840,6 @@ function prepare-kube-proxy-manifest-variables {
   sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" "${src_file}"
   sed -i -e "s@{{kube_watchlist_inconsistency_detector_env_name}}@${kube_watchlist_inconsistency_detector_env_name}@g" "${src_file}"
   sed -i -e "s@{{kube_watchlist_inconsistency_detector_env_value}}@${kube_watchlist_inconsistency_detector_env_value}@g" "${src_file}"
-  sed -i -e "s@{{kube_list_from_cache_inconsistency_detector_env_name}}@${kube_list_from_cache_inconsistency_detector_env_name}@g" "${src_file}"
-  sed -i -e "s@{{kube_list_from_cache_inconsistency_detector_env_value}}@${kube_list_from_cache_inconsistency_detector_env_value}@g" "${src_file}"
   sed -i -e "s@{{ cpurequest }}@${KUBE_PROXY_CPU_REQUEST:-100m}@g" "${src_file}"
   sed -i -e "s@{{ memoryrequest }}@${KUBE_PROXY_MEMORY_REQUEST:-50Mi}@g" "${src_file}"
   sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" "${src_file}"
@@ -2285,12 +2274,6 @@ function start-kube-controller-manager {
     fi
     container_env+="{\"name\": \"KUBE_WATCHLIST_INCONSISTENCY_DETECTOR\", \"value\": \"${ENABLE_KUBE_WATCHLIST_INCONSISTENCY_DETECTOR}\"}"
   fi
-  if [[ -n "${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR:-}" ]]; then
-    if [[ -n "${container_env}" ]]; then
-      container_env="${container_env}, "
-    fi
-    container_env+="{\"name\": \"KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR\", \"value\": \"${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR}\"}"
-  fi
   if [[ -n "${container_env}" ]]; then
     container_env="\"env\":[${container_env}],"
   fi
@@ -2409,12 +2392,6 @@ function start-cloud-controller-manager {
     fi
     container_env+="{\"name\": \"KUBE_WATCHLIST_INCONSISTENCY_DETECTOR\", \"value\": \"${ENABLE_KUBE_WATCHLIST_INCONSISTENCY_DETECTOR}\"}"
   fi
-  if [[ -n "${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR:-}" ]]; then
-    if [[ -n "${container_env}" ]]; then
-      container_env="${container_env}, "
-    fi
-    container_env+="{\"name\": \"KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR\", \"value\": \"${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR}\"}"
-  fi
   if [[ -n "${container_env}" ]]; then
     container_env="\"env\":[${container_env}],"
   fi

cluster/gce/gci/configure-kubeapiserver.sh

@@ -342,18 +342,6 @@ function start-kube-apiserver {
     fi
     container_env+="{\"name\": \"KUBE_WATCHLIST_INCONSISTENCY_DETECTOR\", \"value\": \"${ENABLE_KUBE_WATCHLIST_INCONSISTENCY_DETECTOR}\"}"
   fi
-  if [[ -n "${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR:-}" ]]; then
-    if [[ -n "${container_env}" ]]; then
-      container_env="${container_env}, "
-    fi
-    container_env+="{\"name\": \"KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR\", \"value\": \"${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR}\"}"
-  fi
-  if [[ -n "${ENABLE_KUBE_WATCHCACHE_CONSISTENCY_CHECKER:-}" ]]; then
-    if [[ -n "${container_env}" ]]; then
-      container_env="${container_env}, "
-    fi
-    container_env+="{\"name\": \"KUBE_WATCHCACHE_CONSISTENCY_CHECKER\", \"value\": \"${ENABLE_KUBE_WATCHCACHE_CONSISTENCY_CHECKER}\"}"
-  fi
   if [[ -n "${ENABLE_PATCH_CONVERSION_DETECTOR:-}" ]]; then
     if [[ -n "${container_env}" ]]; then
       container_env="${container_env}, "

cluster/gce/gci/configure.sh

@@ -24,14 +24,15 @@ set -o nounset
 set -o pipefail
 
 ### Hardcoded constants
-DEFAULT_CNI_VERSION='v1.6.2'
-DEFAULT_CNI_HASH='23036eea642c55cd38d6a2d8f18837fac78e3d2bc6ec86dc2047dad5e51323efdc8dfd0482ac78fe9f117e4e630d0015e190e4a6a3544fc50dc59e5083459629'
-DEFAULT_NPD_VERSION='v0.8.20'
-DEFAULT_NPD_HASH_AMD64='09029b62f8023885f3a856c20b5fafecabb880806467848ae25f578c4ee6afacd97c85a0c2d0c582c8d79d3716c83d0e7d324073c5816ae5a812812a6f21450b'
-DEFAULT_NPD_HASH_ARM64='233f7e4451de920b7ce8b0ac0e46da1a07ef559e628a75746ce7927492a1886ebd007875f76462d2d0bf3b1dc807a7e8321108cafbd7db9eee39c0e2cfb6c051'
-DEFAULT_CRICTL_VERSION='v1.32.0'
-DEFAULT_CRICTL_AMD64_SHA512='f0edcc1e6c42315e51789255bdff4f6c2a151ad6f92c7de813b0df3a34ea44211c5c2c369b6629090885f834172819a8c113927c695df8818ccc440abdcb517f'
-DEFAULT_CRICTL_ARM64_SHA512='ef0696b59ccae9c535470111c6385d5721047897c14f9b56ddc1893e170d4053afd254b527f05be248100b0980033035a8fba589402fe47966163021cf0e82e3'
+DEFAULT_CNI_VERSION='v1.7.1'
+# CNI HASH for amd64 sha512
+DEFAULT_CNI_HASH='22c1da53be05ecb8a1672c0a91b38f87d5218babeff0cd0f86e50fc127bf27970d977e748c7c8de765482ed353294b20a75392fb21885d6cae3da724b15c84d3'
+DEFAULT_NPD_VERSION='v0.8.21'
+DEFAULT_NPD_HASH_AMD64='2805ee1da97e06a4b209c198f21763e8687c499687f1b712e4e8e767a75aee4385c9d7fc54f0b190610ea693293a09eded6661ecf15af7af3e787475540fae71'
+DEFAULT_NPD_HASH_ARM64='e2291bbb06d4e831267c2b2a316a668bdff36a502e89826a355cd7f3beeba804e62a2b59a8ec666f4e83042032a379aba9592bcbddf0d57c5a81b3bc1913517c'
+DEFAULT_CRICTL_VERSION='v1.33.0'
+DEFAULT_CRICTL_AMD64_SHA512='9efd084f249bd59d9196e41c6c3c272b07ecac7dadad1b811f07d65ef46047c2886a4c345e84c9bc3252c8ab3bfd5c1429a30c0b61b97b8a7e5b8afb5efb20ec'
+DEFAULT_CRICTL_ARM64_SHA512='8e712080441d9ca3aa99070e55fc768d2050b6f343297286ecc1046281aa9c15191cf2ce5946728048871736fb6ae928f58c10fb1282689264d733fa0029f332'
 DEFAULT_MOUNTER_TAR_SHA='7956fd42523de6b3107ddc3ce0e75233d2fcb78436ff07a1389b6eaac91fb2b1b72a08f7a219eaf96ba1ca4da8d45271002e0d60e0644e796c665f99bb356516'
 AUTH_PROVIDER_GCP_HASH_LINUX_AMD64="${AUTH_PROVIDER_GCP_HASH_LINUX_AMD64:-156058e5b3994cba91c23831774033e0d505d6d8b80f43541ef6af91b320fd9dfaabe42ec8a8887b51d87104c2b57e1eb895649d681575ffc80dd9aee8e563db}"
 AUTH_PROVIDER_GCP_HASH_LINUX_ARM64="${AUTH_PROVIDER_GCP_HASH_LINUX_ARM64:-1aa3b0bea10a9755231989ffc150cbfa770f1d96932db7535473f7bfeb1108bafdae80202ae738d59495982512e716ff7366d5f414d0e76dd50519f98611f9ab}"

cluster/gce/manifests/etcd.manifest

@@ -18,7 +18,7 @@
     {
     "name": "etcd-container",
     {{security_context}}
-    "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.21-0') }}",
+    "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.6.4-0') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}
@@ -34,7 +34,7 @@
         "value": "{{ pillar.get('storage_backend', 'etcd3') }}"
       },
       { "name": "TARGET_VERSION",
-        "value": "{{ pillar.get('etcd_version', '3.5.21') }}"
+        "value": "{{ pillar.get('etcd_version', '3.6.4') }}"
       },
       {
         "name": "DO_NOT_MOVE_BINARIES",

cluster/gce/manifests/kube-proxy.manifest

@@ -33,8 +33,6 @@ spec:
       {{kube_cache_mutation_detector_env_value}}
     {{kube_watchlist_inconsistency_detector_env_name}}
       {{kube_watchlist_inconsistency_detector_env_value}}
-    {{kube_list_from_cache_inconsistency_detector_env_name}}
-      {{kube_list_from_cache_inconsistency_detector_env_value}}
     securityContext:
       privileged: true
     volumeMounts:

cluster/gce/upgrade-aliases.sh

@@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true
 export SECONDARY_RANGE_NAME="pods-default"
 export STORAGE_BACKEND="etcd3"
 export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf"
-export ETCD_IMAGE=3.5.21-0
-export ETCD_VERSION=3.5.21
+export ETCD_IMAGE=3.6.4-0
+export ETCD_VERSION=3.6.4
 
 # Upgrade master with updated kube envs
 "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l

cluster/gce/util.sh

@@ -794,7 +794,6 @@ function construct-linux-kubelet-flags {
       #flags+=" --kubeconfig=/var/lib/kubelet/kubeconfig"
       flags+=" --register-with-taints=node-role.kubernetes.io/control-plane=:NoSchedule"
       flags+=" --kubeconfig=/var/lib/kubelet/bootstrap-kubeconfig"
-      flags+=" --register-schedulable=false"
     fi
     if [[ "${MASTER_OS_DISTRIBUTION}" == "ubuntu" ]]; then
       # Configure the file path for host dns configuration
@@ -1201,7 +1200,6 @@ ENABLE_APISERVER_DYNAMIC_AUDIT: $(yaml-quote "${ENABLE_APISERVER_DYNAMIC_AUDIT:-
 ENABLE_CACHE_MUTATION_DETECTOR: $(yaml-quote "${ENABLE_CACHE_MUTATION_DETECTOR:-false}")
 ENABLE_KUBE_WATCHCACHE_CONSISTENCY_CHECKER: $(yaml-quote "${ENABLE_KUBE_WATCHCACHE_CONSISTENCY_CHECKER:-false}")
 ENABLE_KUBE_WATCHLIST_INCONSISTENCY_DETECTOR: $(yaml-quote "${ENABLE_KUBE_WATCHLIST_INCONSISTENCY_DETECTOR:-false}")
-ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR: $(yaml-quote "${ENABLE_KUBE_LIST_FROM_CACHE_INCONSISTENCY_DETECTOR:-false}")
 ENABLE_PATCH_CONVERSION_DETECTOR: $(yaml-quote "${ENABLE_PATCH_CONVERSION_DETECTOR:-false}")
 ADVANCED_AUDIT_POLICY: $(yaml-quote "${ADVANCED_AUDIT_POLICY:-}")
 ADVANCED_AUDIT_BACKEND: $(yaml-quote "${ADVANCED_AUDIT_BACKEND:-log}")

cluster/gce/windows/k8s-node-setup.psm1

@@ -57,8 +57,8 @@ $GCE_METADATA_SERVER = "169.254.169.254"
 # exist until an initial HNS network has been created on the Windows node - see
 # Add_InitialHnsNetwork().
 $MGMT_ADAPTER_NAME = "vEthernet (Ethernet*"
-$CRICTL_VERSION = 'v1.32.0'
-$CRICTL_SHA512 = 'dc8d5a5821dade9cc56d20f67d77464a0d8b6e43b72cc3c8fa34fdd5927a5eaa7cced6a93906f030e99e9f3e71dd82c60829545a99beccabf4c13b21c8aaf918'
+$CRICTL_VERSION = 'v1.33.0'
+$CRICTL_SHA512 = '81c91c76bb9059837e62b33b7df9f1503013a30525fceb248ca379b57c7ad8ba043dbb0432870224ebc42853c740caa422ddd62989b4a58829b66505f8e11969'
 
 Import-Module -Force C:\common.psm1
 

cmd/cloud-controller-manager/BUILD

@@ -19,6 +19,7 @@ go_library(
     name = "cloud-controller-manager_lib",
     srcs = [
         "gkenetworkparamsetcontroller.go",
+        "gkeservicecontroller.go",
         "main.go",
         "nodeipamcontroller.go",
     ],
@@ -29,12 +30,14 @@ go_library(
         "//pkg/controller/nodeipam",
         "//pkg/controller/nodeipam/config",
         "//pkg/controller/nodeipam/ipam",
+        "//pkg/controller/service",
         "//providers/gce",
         "//vendor/github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned",
         "//vendor/github.com/GoogleCloudPlatform/gke-networking-api/client/network/informers/externalversions",
         "//vendor/github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned",
         "//vendor/github.com/spf13/pflag",
         "//vendor/k8s.io/apimachinery/pkg/util/wait",
+        "//vendor/k8s.io/apiserver/pkg/util/feature",
         "//vendor/k8s.io/cloud-provider",
         "//vendor/k8s.io/cloud-provider/app",
         "//vendor/k8s.io/cloud-provider/app/config",
@@ -58,10 +61,15 @@ image(binary = ":cloud-controller-manager")
 
 go_test(
     name = "cloud-controller-manager_test",
-    srcs = ["nodeipamcontroller_test.go"],
+    srcs = [
+        "gkeservicecontroller_test.go",
+        "nodeipamcontroller_test.go",
+    ],
     embed = [":cloud-controller-manager_lib"],
     deps = [
         "//pkg/controller/nodeipam/config",
+        "//pkg/controller/service",
+        "//vendor/k8s.io/api/core/v1:core",
         "//vendor/k8s.io/cloud-provider",
         "//vendor/k8s.io/cloud-provider/app/config",
         "//vendor/k8s.io/cloud-provider/config",