From aed771ddcfb0f74d7c258e5d0a4ffd4bd1bdacbc Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Thu, 25 Apr 2024 18:09:27 +0000 Subject: [PATCH 1/2] add auth deps for multinode --- cloudbuild/external.pkr.hcl | 9 +++++++++ cloudbuild/internal.pkr.hcl | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/cloudbuild/external.pkr.hcl b/cloudbuild/external.pkr.hcl index f0391436..a3eccf53 100644 --- a/cloudbuild/external.pkr.hcl +++ b/cloudbuild/external.pkr.hcl @@ -118,6 +118,15 @@ build { "sudo systemctl daemon-reload", "sudo systemctl enable cri-docker.socket", "sudo systemctl enable cri-docker.service", + "cd $HOME", + "git clone https://github.com/kubernetes/cloud-provider-gcp.git", + "curl -Lo bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 && sudo install bazel /usr/local/bin/", + "cd cloud-provider-gcp", + "/home/$USER/go/bin/go-licenses check github.com/kubernetes/cloud-provider-gcp", + "/home/$USER/go/bin/go-licenses save github.com/kubernetes/cloud-provider-gcp --save_path=\"../third_party/licenses/cloud-provider-gcp\"", + "bazel build cmd/auth-provider-gcp", + "sudo mkdir -p /etc/kubernetes/bin/", + "sudo cp bazel-bin/cmd/auth-provider-gcp/auth-provider-gcp_/auth-provider-gcp /etc/kubernetes/bin/", ] } diff --git a/cloudbuild/internal.pkr.hcl b/cloudbuild/internal.pkr.hcl index f3b31970..2772d89d 100644 --- a/cloudbuild/internal.pkr.hcl +++ b/cloudbuild/internal.pkr.hcl @@ -115,6 +115,13 @@ build { "sudo systemctl daemon-reload", "sudo systemctl enable cri-docker.socket", "sudo systemctl enable cri-docker.service", + "cd $HOME", + "git clone https://github.com/kubernetes/cloud-provider-gcp.git", + "curl -Lo bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 && sudo install bazel /usr/local/bin/", + "cd cloud-provider-gcp", + "bazel build cmd/auth-provider-gcp", + "sudo mkdir -p /etc/kubernetes/bin/", + "sudo cp bazel-bin/cmd/auth-provider-gcp/auth-provider-gcp_/auth-provider-gcp /etc/kubernetes/bin/", ] } From 983c5ea84478999d5de6812d1716ce74c2cf6dff Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Thu, 25 Apr 2024 20:13:36 +0000 Subject: [PATCH 2/2] fix licensing --- cloudbuild/external.pkr.hcl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloudbuild/external.pkr.hcl b/cloudbuild/external.pkr.hcl index a3eccf53..095e2b43 100644 --- a/cloudbuild/external.pkr.hcl +++ b/cloudbuild/external.pkr.hcl @@ -122,8 +122,7 @@ build { "git clone https://github.com/kubernetes/cloud-provider-gcp.git", "curl -Lo bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 && sudo install bazel /usr/local/bin/", "cd cloud-provider-gcp", - "/home/$USER/go/bin/go-licenses check github.com/kubernetes/cloud-provider-gcp", - "/home/$USER/go/bin/go-licenses save github.com/kubernetes/cloud-provider-gcp --save_path=\"../third_party/licenses/cloud-provider-gcp\"", + "curl --create-dirs -o third_party/licenses/cloud-provider-gcp/LICENSE https://raw.githubusercontent.com/kubernetes/cloud-provider-gcp/master/LICENSE", "bazel build cmd/auth-provider-gcp", "sudo mkdir -p /etc/kubernetes/bin/", "sudo cp bazel-bin/cmd/auth-provider-gcp/auth-provider-gcp_/auth-provider-gcp /etc/kubernetes/bin/",