Skip to content

Commit

Permalink
fix: Install protoc to run codegen; fix warnings in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
bryantbiggs committed Apr 28, 2024
1 parent ff575cf commit 510d56b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion deploy/example.yaml
Expand Up @@ -227,7 +227,7 @@ spec:
# - output (output kubeconfig to plug into your apiserver configuration, mounted from the host)
containers:
- name: aws-iam-authenticator
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:v0.5.3
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:v0.6.14
args:
- server
# uncomment if using EKS-Style ConfigMap
Expand Down
7 changes: 4 additions & 3 deletions hack/e2e/deploy.yaml
Expand Up @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/e2e/run.sh
Expand Up @@ -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

Expand All @@ -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}"

Expand Down
4 changes: 4 additions & 0 deletions hack/test-integration.sh
Expand Up @@ -89,10 +89,14 @@ if [[ -d ${TEST_ARTIFACTS}/k8s.io/kubernetes ]]; then
rm -rf ${TEST_ARTIFACTS}/k8s.io/kubernetes
fi

go install golang.org/x/tools/cmd/goimports

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
export PATH="/home/prow/go/src/github.com/kubernetes-sigs/aws-iam-authenticator/test-artifacts/k8s.io/kubernetes/third_party/protoc:${PATH}"
./hack/update-codegen.sh
./hack/install-etcd.sh
export PATH="${TEST_ARTIFACTS}/k8s.io/kubernetes/third_party/etcd:${PATH}"
Expand Down

0 comments on commit 510d56b

Please sign in to comment.