Skip to content

Commit fdbec62

Browse files
committed
remove hardcoded optout image version
2 parents ba390d6 + a558367 commit fdbec62

File tree

5 files changed

+23
-2
lines changed

5 files changed

+23
-2
lines changed

.github/workflows/run-e2e-tests-on-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
target_environment: ${{ inputs.target_environment }}
125125
delay_operator_shutdown: ${{ inputs.delay_operator_shutdown }}
126126
operator_image_version: ${{ inputs.operator_image_version }}
127-
core_image_version: ${{ inputs.core_image_version }}
127+
core_image_version: 2.30.39-alpha-161-SNAPSHOT # hardcoded to wzh-UID2-6362-E2E-pipeline-fix-workaround-private
128128
optout_image_version: ${{ inputs.optout_image_version }}
129129
e2e_image_version: ${{ inputs.e2e_image_version }}
130130
operator_branch: ${{ github.ref }}

.trivyignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,10 @@ CVE-2025-64720 exp:2026-06-05
1616

1717
# UID2-6340
1818
CVE-2025-65018 exp:2026-06-05
19+
20+
21+
# ignore for testing only.
22+
# Investigating below vulnerabilites are out of scope of this ticket
23+
CVE-2025-66418
24+
CVE-2025-66471
25+
# ignore for testing only.

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-operator</artifactId>
9-
<version>5.62.11</version>
9+
<version>5.62.16-alpha-583-SNAPSHOT</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -240,6 +240,12 @@
240240
<artifactId>attestation-gcp</artifactId>
241241
<version>${enclave-gcp.version}</version>
242242
</dependency>
243+
<!-- Required for GCP Secret Manager - attestation-gcp uses newer gax-rpc that needs this -->
244+
<dependency>
245+
<groupId>com.google.auth</groupId>
246+
<artifactId>google-auth-library-oauth2-http</artifactId>
247+
<version>1.41.0</version>
248+
</dependency>
243249
</dependencies>
244250
</profile>
245251
</profiles>

scripts/azure-aks/deployment/generate-deployment-artifacts.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ for f in ${INPUT_FILES[@]}; do
5252
done
5353

5454
az version
55+
# Upgrade typing_extensions to fix pydantic-core compatibility issue with confcom extension
56+
# The confcom extension requires typing_extensions>=4.10.0 for the Sentinel class
57+
sudo /opt/az/bin/python3 -m pip install --upgrade typing_extensions
58+
5559
# Install confcom extension, az is originally available in GitHub workflow environment
5660
az extension add --name confcom
5761
if [[ $? -ne 0 ]]; then

scripts/azure-cc/deployment/generate-deployment-artifacts.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ for f in ${INPUT_FILES[@]}; do
5555
done
5656

5757
az version
58+
# Upgrade typing_extensions to fix pydantic-core compatibility issue with confcom extension
59+
# The confcom extension requires typing_extensions>=4.10.0 for the Sentinel class
60+
sudo /opt/az/bin/python3 -m pip install --upgrade typing_extensions
61+
5862
# Install confcom extension, az is originally available in GitHub workflow environment
5963
az extension add --name confcom
6064
if [[ $? -ne 0 ]]; then

0 commit comments

Comments
 (0)