Skip to content

Commit cb81ecd

Browse files
committed
ci: fix merge-conflict regressions from main pickup (runner labels, ui.bzl, fork cockpit)
The merge of main into ae-followup-auth (0c65751) silently took the upstream version on a swath of files where the fork had previously deviated. This commit reverts the merge's regressions back to the fork-correct state (origin/ae-prod) AND completes the runner-label sweep so every release/mirror/perf workflow uses the same -vm-16cpu label the fork's runner pool actually has. 1. Runner labels — main re-introduced 'oracle-16cpu-64gb-x86-64' and 'oracle-8cpu-32gb-x86-64' on 7 workflows. Fork's pool only resolves 'oracle-vm-16cpu-64gb-x86-64'; both stale labels sit queued forever. Fixed: cli_release.yaml (L18+L212), cloud_release.yaml (L18), mirror_demos.yaml (L12), mirror_deps.yaml (L12), mirror_releases.yaml (L13), operator_release.yaml (L18+L143), perf_common.yaml (L37+L60). vizier_release.yaml L18 was fixed already in 0fd9c3f. 2. bazel/ui.bzl — main reverted PR #64's webpack-build fixes that broke release/cloud/v0.0.10 with 'export: `18': not a valid identifier'. Restored: 'set -x' for action-shell tracing, PATH that puts /opt/px_dev/tools/node/bin FIRST, 'hash -r', the STABLE_BUILD_TAG|BUILD_TIMESTAMP allowlist sed (vs the wildcard that word-splits FORMATTED_DATE), and use_default_shell_env=True so --incompatible_strict_action_env doesn't strip yarn from PATH. 3. 28 fork-cloud config files — main's PR pixie-io#2391 (cert-manager migration) deleted private/cockpit/*, terraform/kubernetes/auth0/*, terraform/kubernetes/cloud_deps/*, .sops.yaml, private/skaffold_cloud.yaml. These are still load- bearing for the AOCC pixie-cloud deployment; the fork hasn't migrated to cert-manager-compatible secrets yet (PR pixie-io#2391's monitor.go fallback path is in place, so adoption is the follow-up, not a blocker). Restored all 28 from origin/ae-prod. Genuine main pickups that were CORRECT to keep (no fix needed): the src/utils/shared/k8s/{apply,delete}.go import-order + sets.New[string] generics migration, src/operator/controllers/monitor.go's cert-manager secret fallback, and the src/carnot/BUILD.bazel + src/carnot/exec/BUILD.bazel additions.
1 parent 0fd9c3f commit cb81ecd

36 files changed

Lines changed: 10308 additions & 14 deletions

.github/workflows/cli_release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read
@@ -209,7 +209,7 @@ jobs:
209209
update-gh-artifacts-manifest:
210210
if: |
211211
always() && needs.create-github-release.result == 'success'
212-
runs-on: oracle-8cpu-32gb-x86-64
212+
runs-on: oracle-vm-16cpu-64gb-x86-64
213213
needs: [get-dev-image, create-github-release]
214214
container:
215215
image: ${{ needs.get-dev-image.outputs.image-with-tag }}

.github/workflows/cloud_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read

.github/workflows/mirror_demos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
permissions:
1010
contents: read
1111
packages: write
12-
runs-on: oracle-16cpu-64gb-x86-64
12+
runs-on: oracle-vm-16cpu-64gb-x86-64
1313
steps:
1414
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2
1515
with:

.github/workflows/mirror_deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
permissions:
1010
contents: read
1111
packages: write
12-
runs-on: oracle-16cpu-64gb-x86-64
12+
runs-on: oracle-vm-16cpu-64gb-x86-64
1313
steps:
1414
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2
1515
with:

.github/workflows/mirror_releases.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
permissions:
1111
contents: read
1212
packages: write
13-
runs-on: oracle-16cpu-64gb-x86-64
13+
runs-on: oracle-vm-16cpu-64gb-x86-64
1414
steps:
1515
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2
1616
with:

.github/workflows/operator_release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read
@@ -140,7 +140,7 @@ jobs:
140140
git commit -s -m "Release Helm chart ${VERSION}"
141141
git push origin "gh-pages"
142142
update-gh-artifacts-manifest:
143-
runs-on: oracle-8cpu-32gb-x86-64
143+
runs-on: oracle-vm-16cpu-64gb-x86-64
144144
needs: [get-dev-image, create-github-release]
145145
container:
146146
image: ${{ needs.get-dev-image.outputs.image-with-tag }}

.github/workflows/perf_common.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
ref: ${{ inputs.ref }}
3535
generate-perf-matrix:
3636
needs: get-dev-image-with-extras
37-
runs-on: oracle-16cpu-64gb-x86-64
37+
runs-on: oracle-vm-16cpu-64gb-x86-64
3838
container:
3939
image: ${{ needs.get-dev-image-with-extras.outputs.image-with-tag }}
4040
outputs:
@@ -57,7 +57,7 @@ jobs:
5757
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
5858
run-perf-eval:
5959
needs: [get-dev-image-with-extras, generate-perf-matrix]
60-
runs-on: oracle-16cpu-64gb-x86-64
60+
runs-on: oracle-vm-16cpu-64gb-x86-64
6161
container:
6262
image: ${{ needs.get-dev-image-with-extras.outputs.image-with-tag }}
6363
strategy:

.sops.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
# az login -t 1e8a0c86-2410-4f48-91c3-dc1d164680ca
3+
creation_rules:
4+
- path_regex: terraform/credentials/cockpit
5+
azure_keyvault: https://kv-pixie-cloud.vault.azure.net/keys/sops-key

bazel/ui.bzl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
# This file contains rules for for our UI builds.
1818

1919
ui_shared_cmds_start = [
20+
"set -x",
2021
'export BASE_PATH="$(pwd)"',
21-
"export PATH=/usr/local/bin:/opt/px_dev/tools/node/bin:$PATH",
22-
'export HOME="$(mktemp -d)"', # This makes node-gyp happy.
22+
"export PATH=/opt/px_dev/tools/node/bin:/usr/local/bin:$PATH",
23+
"hash -r",
24+
'export HOME="$(mktemp -d)"',
2325
'export TMPPATH="$(mktemp -d)"',
2426
]
2527

@@ -49,6 +51,7 @@ def _pl_webpack_deps_impl(ctx):
4951
execution_requirements = {tag: "" for tag in ctx.attr.tags},
5052
outputs = [out],
5153
command = " && ".join(cmd),
54+
use_default_shell_env = True,
5255
progress_message =
5356
"Generating webpack deps %s" % out.short_path,
5457
)
@@ -72,8 +75,8 @@ def _pl_webpack_library_impl(ctx):
7275
# and apply it to the environment here. Hopefully,
7376
# no special characters/spaces/quotes in the results ...
7477
env_cmds = [
75-
'$(sed -E "s/^([A-Za-z_]+)\\s*(.*)/export \\1=\\2/g" "{}")'.format(ctx.info_file.path),
76-
'$(sed -E "s/^([A-Za-z_]+)\\s*(.*)/export \\1=\\2/g" "{}")'.format(ctx.version_file.path),
78+
'$(sed -E -n "s/^(STABLE_BUILD_TAG|BUILD_TIMESTAMP)\\s+(.*)/export \\1=\\2/p" "{}")'.format(ctx.info_file.path),
79+
'$(sed -E -n "s/^(STABLE_BUILD_TAG|BUILD_TIMESTAMP)\\s+(.*)/export \\1=\\2/p" "{}")'.format(ctx.version_file.path),
7780
]
7881
all_files.append(ctx.info_file)
7982
all_files.append(ctx.version_file)
@@ -95,6 +98,7 @@ def _pl_webpack_library_impl(ctx):
9598
execution_requirements = {tag: "" for tag in ctx.attr.tags},
9699
outputs = [out],
97100
command = " && ".join(cmd),
101+
use_default_shell_env = True,
98102
progress_message =
99103
"Generating webpack bundle %s" % out.short_path,
100104
)
@@ -170,6 +174,7 @@ def _pl_deps_licenses_impl(ctx):
170174
execution_requirements = {tag: "" for tag in ctx.attr.tags},
171175
outputs = [out],
172176
command = " && ".join(cmd),
177+
use_default_shell_env = True,
173178
progress_message =
174179
"Generating licenses %s" % out.short_path,
175180
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: pl-artifact-config
6+
data:
7+
PL_ARTIFACT_MANIFEST_URL: https://k8sstormcenter.github.io/pixie/artifacts/manifest.json
8+
PL_ARTIFACT_BUCKET: ""
9+
PL_SA_KEY_PATH: ""

0 commit comments

Comments
 (0)