From b2f69f665fda967b7dfc04267f95d62988b5f6be Mon Sep 17 00:00:00 2001 From: Dom Delnano Date: Thu, 20 Jun 2024 11:05:44 -0700 Subject: [PATCH] Add x86_64 sysroot profile to cloud and operator skaffold configs (#1941) --- skaffold/skaffold_cloud.yaml | 17 ++++++++--------- skaffold/skaffold_operator.yaml | 6 ++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/skaffold/skaffold_cloud.yaml b/skaffold/skaffold_cloud.yaml index 85419b35ec4..2b29e22e436 100644 --- a/skaffold/skaffold_cloud.yaml +++ b/skaffold/skaffold_cloud.yaml @@ -1,4 +1,9 @@ --- +.common_bazel_args: &common_bazel_args +- --compilation_mode=opt +- --config=stamp +- --action_env=GOOGLE_APPLICATION_CREDENTIALS +- --config=x86_64_sysroot apiVersion: skaffold/v4beta1 kind: Config build: @@ -112,9 +117,7 @@ profiles: - op: add path: /build/artifacts/context=./bazel/args value: - - --compilation_mode=opt - - --config=stamp - - --action_env=GOOGLE_APPLICATION_CREDENTIALS + *common_bazel_args - op: replace path: /manifests/kustomize/paths value: @@ -126,9 +129,7 @@ profiles: - op: add path: /build/artifacts/context=./bazel/args value: - - --compilation_mode=opt - - --config=stamp - - --action_env=GOOGLE_APPLICATION_CREDENTIALS + *common_bazel_args - op: replace path: /manifests/kustomize/paths value: @@ -140,9 +141,7 @@ profiles: - op: add path: /build/artifacts/context=./bazel/args value: - - --compilation_mode=opt - - --config=stamp - - --action_env=GOOGLE_APPLICATION_CREDENTIALS + *common_bazel_args - op: replace path: /manifests/kustomize/paths value: diff --git a/skaffold/skaffold_operator.yaml b/skaffold/skaffold_operator.yaml index 3c6c7f7b617..42323ffe167 100644 --- a/skaffold/skaffold_operator.yaml +++ b/skaffold/skaffold_operator.yaml @@ -22,3 +22,9 @@ profiles: path: /build/local value: push: false +- name: x86_64_sysroot + patches: + - op: add + path: /build/artifacts/context=./bazel/args + value: + - --config=x86_64_sysroot