From 6c900ebbb685470fb92c450660c222a64d617f4e Mon Sep 17 00:00:00 2001
From: Bryant Biggs <bryantbiggs@gmail.com>
Date: Sun, 28 Apr 2024 09:22:40 -0400
Subject: [PATCH] fix: Install protoc to run codegen; fix warnings in CI

---
 hack/e2e/deploy.yaml     | 7 ++++---
 hack/e2e/run.sh          | 4 ++--
 hack/test-integration.sh | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hack/e2e/deploy.yaml b/hack/e2e/deploy.yaml
index 523aff132..2133216da 100644
--- a/hack/e2e/deploy.yaml
+++ b/hack/e2e/deploy.yaml
@@ -194,12 +194,9 @@ spec:
     type: RollingUpdate
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         k8s-app: aws-iam-authenticator
     spec:
-
       # use service account with access to
       serviceAccountName: aws-iam-authenticator
 
@@ -209,6 +206,10 @@ spec:
       # run on each master node
       nodeSelector:
         node-role.kubernetes.io/master: ""
+
+      # mark pod as critical to the cluster
+      priorityClassName: system-cluster-critical
+
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
diff --git a/hack/e2e/run.sh b/hack/e2e/run.sh
index 6ce61d66b..f6d011b73 100755
--- a/hack/e2e/run.sh
+++ b/hack/e2e/run.sh
@@ -196,7 +196,7 @@ fi
 ## Applying test roles
 
 loudecho "Applying testing roles"
-${KUBECTL_BIN} apply -f "${ROLES_SPEC_FILE}" --kubeconfig "${KUBECONFIG_ADMIN}"
+${KUBECTL_BIN} apply --server-side -f "${ROLES_SPEC_FILE}" --kubeconfig "${KUBECONFIG_ADMIN}"
 
 ## Updating the DaemonSet
 
@@ -218,7 +218,7 @@ sed -i "s#<IMAGE_NAME>#${IMAGE_NAME}:${IMAGE_TAG}#g" "${DAEMONSET_FILE}"
 ## applying the daemonset to the cluster
 
 loudecho "Applying the daemonset"
-${KUBECTL_BIN} apply -f "${DAEMONSET_FILE}" --kubeconfig "${KUBECONFIG_ADMIN}"
+${KUBECTL_BIN} apply --server-side -f "${DAEMONSET_FILE}" --kubeconfig "${KUBECONFIG_ADMIN}"
 
 kubectl get pods -n kube-system --kubeconfig "${KUBECONFIG_ADMIN}" | grep aws-iam-authenticator | awk '{print $1}' | xargs kubectl delete pod -n kube-system --kubeconfig "${KUBECONFIG_ADMIN}"
 
diff --git a/hack/test-integration.sh b/hack/test-integration.sh
index 1bc319bf1..439e3f689 100755
--- a/hack/test-integration.sh
+++ b/hack/test-integration.sh
@@ -93,6 +93,7 @@ mkdir -p ${TEST_ARTIFACTS}/k8s.io/kubernetes
 git clone --branch ${KUBERNETES_TAG} --depth 1 https://github.com/kubernetes/kubernetes.git ${TEST_ARTIFACTS}/k8s.io/kubernetes --depth 1
 
 pushd ${TEST_ARTIFACTS}/k8s.io/kubernetes
+./hack/install-protoc.sh
 ./hack/update-codegen.sh
 ./hack/install-etcd.sh
 export PATH="${TEST_ARTIFACTS}/k8s.io/kubernetes/third_party/etcd:${PATH}"