From 472ceb524e88ae66d27bc61ad8a425153b81a3e6 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 29 Oct 2026 13:13:50 +1100 Subject: [PATCH 1/6] UID2-8220 Pin Azure artifact jobs to ubuntu-24.04 ubuntu-latest now resolves to Ubuntu 26.04, whose azure-cli apt repo has no 2.61.0. Co-Authored-By: Claude Sonnet 5.5 --- .github/workflows/publish-azure-cc-enclave-docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-azure-cc-enclave-docker.yaml b/.github/workflows/publish-azure-cc-enclave-docker.yaml index 54ecce628..4cd8b124f 100644 --- a/.github/workflows/publish-azure-cc-enclave-docker.yaml +++ b/.github/workflows/publish-azure-cc-enclave-docker.yaml @@ -221,7 +221,7 @@ jobs: azureCc: name: Create Azure CC artifacts - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: contents: read id-token: write @@ -280,7 +280,7 @@ jobs: azureAks: name: Create Azure AKS artifacts - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: contents: read id-token: write From 6ce63ae4f3587e055bc0335854901afc7bbbee5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 02:17:36 +0000 Subject: [PATCH 2/6] [CI Pipeline] Released Snapshot version: 5.70.356-alpha-266-SNAPSHOT [no-jira - reason: automated release] Automated release (PR #2802). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 300cc1cc9..0253d6e71 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.70.355 + 5.70.356-alpha-266-SNAPSHOT UTF-8 From 78cc58033ce47a081026972343630398af39a3cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 02:23:17 +0000 Subject: [PATCH 3/6] [CI Pipeline] Released Snapshot version: 5.70.357-alpha-267-SNAPSHOT [no-jira - reason: automated release] Automated release (PR #2803). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0253d6e71..e11b42de8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.70.356-alpha-266-SNAPSHOT + 5.70.357-alpha-267-SNAPSHOT UTF-8 From b68cace279055175cd7c7c8ff41bf93b71003dc6 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 29 Oct 2026 15:12:51 +1100 Subject: [PATCH 4/6] UID2-8220 Restore pom.xml version to 5.70.355 Undo the Snapshot version bumps committed by test runs of the publish workflow. Co-Authored-By: Claude Sonnet 5.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e11b42de8..300cc1cc9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.70.357-alpha-267-SNAPSHOT + 5.70.355 UTF-8 From ff327b81a47f97046c0069b96fea5f1516c94f57 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 29 Oct 2026 15:47:32 +1100 Subject: [PATCH 5/6] UID2-8220 Pin confcom extension instead of azure-cli Drop the azure-cli 2.61.0 pin and run on ubuntu-latest. The confcom extension generates the CCE policy, so pin it to 2.4.1. Co-Authored-By: Claude Sonnet 5.5 --- .github/actions/install_az_cli/action.yaml | 36 ------------------- .../publish-azure-cc-enclave-docker.yaml | 10 ++---- .../generate-deployment-artifacts.sh | 2 +- .../generate-deployment-artifacts.sh | 2 +- 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 .github/actions/install_az_cli/action.yaml diff --git a/.github/actions/install_az_cli/action.yaml b/.github/actions/install_az_cli/action.yaml deleted file mode 100644 index 19bdb382c..000000000 --- a/.github/actions/install_az_cli/action.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: 'Install Azure CLI' -description: 'Install Azure CLI' -runs: - using: 'composite' - steps: - - name: uninstall azure-cli - shell: bash - run: | - sudo apt-get remove -y azure-cli - - - name: install azure-cli 2.61.0 - shell: bash - run: | - sudo apt-get update - sudo apt-get install apt-transport-https ca-certificates curl gnupg lsb-release - sudo mkdir -p /etc/apt/keyrings - curl -sLS https://packages.microsoft.com/keys/microsoft.asc | - gpg --dearmor | sudo tee /etc/apt/keyrings/microsoft.gpg > /dev/null - sudo chmod go+r /etc/apt/keyrings/microsoft.gpg - AZ_DIST=$(lsb_release -cs) - echo "Types: deb - URIs: https://packages.microsoft.com/repos/azure-cli/ - Suites: ${AZ_DIST} - Components: main - Architectures: $(dpkg --print-architecture) - Signed-by: /etc/apt/keyrings/microsoft.gpg" | sudo tee /etc/apt/sources.list.d/azure-cli.sources - sudo apt-get update - sudo apt-get install azure-cli - - apt-cache policy azure-cli - # Obtain the currently installed distribution - AZ_DIST=$(lsb_release -cs) - # Store an Azure CLI version of choice - AZ_VER=2.61.0 - # Install a specific version - sudo apt-get install azure-cli=${AZ_VER}-1~${AZ_DIST} --allow-downgrades diff --git a/.github/workflows/publish-azure-cc-enclave-docker.yaml b/.github/workflows/publish-azure-cc-enclave-docker.yaml index 4cd8b124f..d5fda3efa 100644 --- a/.github/workflows/publish-azure-cc-enclave-docker.yaml +++ b/.github/workflows/publish-azure-cc-enclave-docker.yaml @@ -221,7 +221,7 @@ jobs: azureCc: name: Create Azure CC artifacts - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest permissions: contents: read id-token: write @@ -232,9 +232,6 @@ jobs: - name: Checkout uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - name: Install Azure CLI - uses: ./.github/actions/install_az_cli - - name: check azure-cli version run: | az --version @@ -280,7 +277,7 @@ jobs: azureAks: name: Create Azure AKS artifacts - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest permissions: contents: read id-token: write @@ -291,9 +288,6 @@ jobs: - name: Checkout uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - name: Install Azure CLI - uses: ./.github/actions/install_az_cli - - name: check azure-cli version run: | az --version diff --git a/scripts/azure-aks/deployment/generate-deployment-artifacts.sh b/scripts/azure-aks/deployment/generate-deployment-artifacts.sh index 895b0bb96..7ca4c36b4 100644 --- a/scripts/azure-aks/deployment/generate-deployment-artifacts.sh +++ b/scripts/azure-aks/deployment/generate-deployment-artifacts.sh @@ -57,7 +57,7 @@ az version sudo /opt/az/bin/python3 -m pip install --upgrade typing_extensions # Install confcom extension, az is originally available in GitHub workflow environment -az extension add --name confcom +az extension add --name confcom --version 2.4.1 if [[ $? -ne 0 ]]; then echo "Failed to install Azure confcom extension" exit 1 diff --git a/scripts/azure-cc/deployment/generate-deployment-artifacts.sh b/scripts/azure-cc/deployment/generate-deployment-artifacts.sh index 5c6214243..7ae551aaa 100644 --- a/scripts/azure-cc/deployment/generate-deployment-artifacts.sh +++ b/scripts/azure-cc/deployment/generate-deployment-artifacts.sh @@ -60,7 +60,7 @@ az version sudo /opt/az/bin/python3 -m pip install --upgrade typing_extensions # Install confcom extension, az is originally available in GitHub workflow environment -az extension add --name confcom +az extension add --name confcom --version 2.4.1 if [[ $? -ne 0 ]]; then echo "Failed to install Azure confcom extension" exit 1 From fa3be2c38489ff36636197228451315030f1e28a Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 29 Oct 2026 16:01:24 +1100 Subject: [PATCH 6/6] UID2-8220 Keep install_az_cli action for future use Co-Authored-By: Claude Sonnet 5.5 --- .github/actions/install_az_cli/action.yaml | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/actions/install_az_cli/action.yaml diff --git a/.github/actions/install_az_cli/action.yaml b/.github/actions/install_az_cli/action.yaml new file mode 100644 index 000000000..19bdb382c --- /dev/null +++ b/.github/actions/install_az_cli/action.yaml @@ -0,0 +1,36 @@ +name: 'Install Azure CLI' +description: 'Install Azure CLI' +runs: + using: 'composite' + steps: + - name: uninstall azure-cli + shell: bash + run: | + sudo apt-get remove -y azure-cli + + - name: install azure-cli 2.61.0 + shell: bash + run: | + sudo apt-get update + sudo apt-get install apt-transport-https ca-certificates curl gnupg lsb-release + sudo mkdir -p /etc/apt/keyrings + curl -sLS https://packages.microsoft.com/keys/microsoft.asc | + gpg --dearmor | sudo tee /etc/apt/keyrings/microsoft.gpg > /dev/null + sudo chmod go+r /etc/apt/keyrings/microsoft.gpg + AZ_DIST=$(lsb_release -cs) + echo "Types: deb + URIs: https://packages.microsoft.com/repos/azure-cli/ + Suites: ${AZ_DIST} + Components: main + Architectures: $(dpkg --print-architecture) + Signed-by: /etc/apt/keyrings/microsoft.gpg" | sudo tee /etc/apt/sources.list.d/azure-cli.sources + sudo apt-get update + sudo apt-get install azure-cli + + apt-cache policy azure-cli + # Obtain the currently installed distribution + AZ_DIST=$(lsb_release -cs) + # Store an Azure CLI version of choice + AZ_VER=2.61.0 + # Install a specific version + sudo apt-get install azure-cli=${AZ_VER}-1~${AZ_DIST} --allow-downgrades