Skip to content

Commit 3fce9d9

Browse files
authored
[ci] Update pulumi k8s operator to v2 (#1017)
1 parent a1a2dcf commit 3fce9d9

File tree

21 files changed

+3034
-378
lines changed

21 files changed

+3034
-378
lines changed

build-tools/copy_release_images_to_ghcr.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,7 @@ fi
7979
for VERSION in $VERSIONS; do
8080
# Iterate through the directories in the cluster images directory
8181
for IMAGE_NAME in $IMAGES; do
82-
if [ "$IMAGE_NAME" == "pulumi-kubernetes-operator" ]; then
83-
TAG="v${VERSION}"
84-
else
85-
TAG="$VERSION"
86-
fi
82+
TAG="$VERSION"
8783
# Construct the full image names
8884
SOURCE_IMAGE="$SRC_REGISTRY/$IMAGE_NAME:$TAG"
8985
TARGET_IMAGE="$DEST_REGISTRY/$IMAGE_NAME:$TAG"

build-tools/get-docker-image-reference

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,4 @@ set -euo pipefail
1313

1414
version="$(get-snapshot-version)"
1515

16-
# the version has a v prefix hardcoded in the pulumi-kuburnetes-operator helm chart so we add one as well
17-
if [ "$appname" == "pulumi-kubernetes-operator" ]; then
18-
version="v${version}"
19-
fi
20-
2116
echo "$DEV_DOCKER_REGISTRY/${appname}:${version}"

cluster/deployment/scratchneta/.envrc.vars

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ export CLOUDSDK_CORE_PROJECT=da-cn-scratchnet
33
export GCP_CLUSTER_BASENAME="scratcha"
44
export GCP_MASTER_IPV4_CIDR="172.16.8.32/28"
55
export GCP_CLUSTER_HOSTNAME="${GCP_CLUSTER_BASENAME}.network.canton.global"
6+
# We first set it to empty because dotenv doesn't respect unset so we need another way to remove the value
7+
export PRIVATE_CONFIGS_PATH=""
8+
export PUBLIC_CONFIGS_PATH=""
69
unset PRIVATE_CONFIGS_PATH
710
unset PUBLIC_CONFIGS_PATH
811

cluster/deployment/scratchnetb/.envrc.vars

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ export CLOUDSDK_CORE_PROJECT=da-cn-scratchnet
33
export GCP_CLUSTER_BASENAME="scratchb"
44
export GCP_MASTER_IPV4_CIDR="172.16.5.32/28"
55
export GCP_CLUSTER_HOSTNAME="${GCP_CLUSTER_BASENAME}.network.canton.global"
6+
# We first set it to empty because dotenv doesn't respect unset so we need another way to remove the value
7+
export PRIVATE_CONFIGS_PATH=""
8+
export PUBLIC_CONFIGS_PATH=""
69
unset PRIVATE_CONFIGS_PATH
710
unset PUBLIC_CONFIGS_PATH
811

cluster/deployment/scratchnetc/.envrc.vars

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ export CLOUDSDK_CORE_PROJECT=da-cn-scratchnet
33
export GCP_CLUSTER_BASENAME="scratchc"
44
export GCP_MASTER_IPV4_CIDR="172.16.6.32/28"
55
export GCP_CLUSTER_HOSTNAME="${GCP_CLUSTER_BASENAME}.network.canton.global"
6+
# We first set it to empty because dotenv doesn't respect unset so we need another way to remove the value
7+
export PRIVATE_CONFIGS_PATH=""
8+
export PUBLIC_CONFIGS_PATH=""
69
unset PRIVATE_CONFIGS_PATH
710
unset PUBLIC_CONFIGS_PATH
811

cluster/deployment/scratchnetd/.envrc.vars

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ export CLOUDSDK_CORE_PROJECT=da-cn-scratchnet
33
export GCP_CLUSTER_BASENAME="scratchd"
44
export GCP_MASTER_IPV4_CIDR="172.16.9.32/28"
55
export GCP_CLUSTER_HOSTNAME="${GCP_CLUSTER_BASENAME}.network.canton.global"
6+
# We first set it to empty because dotenv doesn't respect unset so we need another way to remove the value
7+
export PRIVATE_CONFIGS_PATH=""
8+
export PUBLIC_CONFIGS_PATH=""
69
unset PRIVATE_CONFIGS_PATH
710
unset PUBLIC_CONFIGS_PATH
811

@@ -35,6 +38,6 @@ export APPROVE_SV_RUNBOOK=true
3538

3639
# TODO(#14679): Remove
3740
export VALIDATOR_RUNBOOK_POSTGRES_PVC_SIZE="240Gi"
38-
export OVERRIDE_VERSION="0.3.20-snapshot.20250407.8755.0.v4946b1b9"
39-
export CHARTS_VERSION="0.3.20-snapshot.20250407.8755.0.v4946b1b9"
41+
export OVERRIDE_VERSION="0.4.0"
42+
export CHARTS_VERSION="0.4.0"
4043
export CACHE_DEV_DOCKER_REGISTRY=$DEV_DOCKER_REGISTRY

cluster/deployment/scratchnete/.envrc.vars

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ export CLOUDSDK_CORE_PROJECT=da-cn-scratchnet
33
export GCP_CLUSTER_BASENAME="scratche"
44
export GCP_MASTER_IPV4_CIDR="172.16.30.32/28"
55
export GCP_CLUSTER_HOSTNAME="${GCP_CLUSTER_BASENAME}.network.canton.global"
6+
# We first set it to empty because dotenv doesn't respect unset so we need another way to remove the value
7+
export PRIVATE_CONFIGS_PATH=""
8+
export PUBLIC_CONFIGS_PATH=""
69
unset PRIVATE_CONFIGS_PATH
710
unset PUBLIC_CONFIGS_PATH
811

0 commit comments

Comments
 (0)