Add x86_64 sysroot profile to cloud and operator skaffold configs (#1941

)
pixie-io · Jun 20, 2024 · b2f69f6 · b2f69f6
1 parent 7359d40
commit b2f69f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -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