Skip to content

Commit 62fa159

Browse files
sheylatrudosheylatrudo
committed
fixup! Update Variables to Generated Values
1 parent 64e71ee commit 62fa159

File tree

9 files changed

+33
-11
lines changed

9 files changed

+33
-11
lines changed

‎.pipelines/build/binaries.jobs.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
ob_outputDirectory: $(Build.ArtifactStagingDirectory)/out
1818
ob_artifactSuffix: _$(artifact)
1919
ob_git_checkout: false
20+
REPO_ROOT: $(Build.SourcesDirectory)/${{ job_data.templateContext.repositoryArtifact }}
2021
${{ if eq(job_data.job, 'linux_amd64') }}:
2122
LinuxContainerImage: $(LinuxContainerImage2)
2223
ARCH: amd64

‎.pipelines/build/binary.steps.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ steps:
4141
displayName: "Build Binary - ${{ parameters.target }}"
4242
workingDirectory: $(ACN_DIR)
4343
env:
44+
REPO_ROOT: $(ACN_DIR)
4445
TARGET: ${{ parameters.target }}
4546
GOOS: ${{ parameters.os }}
4647
GOARCH: ${{ parameters.arch }}

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ stages:
6464
- publish
6565
- setup
6666
displayName: "Cilium Test - ${{ parameters.name }}"
67+
variables:
68+
IMAGE_REPO_PATH: '/artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
69+
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
70+
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
71+
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
72+
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
73+
CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
74+
CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
75+
IPV6_HP_BPF_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/ipv6-hp-bpf
6776
jobs:
6877
- ${{if eq(parameters.hubbleEnabled, false)}}:
6978
- job: deploy_cilium_components
@@ -108,8 +117,7 @@ stages:
108117
109118
if [ ! -z ${{ parameters.dualstackVersion }} ]; then
110119
echo "Use dualstack daemonset for Cilium"
111-
export IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
112-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
120+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_IMAGE_NAME_OVERRIDE},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
113121
else
114122
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
115123
fi

‎.pipelines/cni/cilium/cilium-scale-test.yaml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ stages:
3030
kubectl get po -owide -A
3131
- stage: update_daemonset_versions
3232
displayName: "Update Cilium + CNS Version and Restart Nodes"
33+
dependsOn:
34+
- setup
35+
variables:
36+
IMAGE_REPO_PATH: '/artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
37+
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
38+
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
39+
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
40+
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
41+
CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
42+
CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
43+
IPV6_HP_BPF_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/ipv6-hp-bpf
3344
jobs:
3445
- job: update_version
3546
pool:
@@ -66,7 +77,7 @@ stages:
6677
export CILIUM_IMAGE_REGISTRY=${CILIUM_IMAGE_REGISTRY}
6778
if ${IS_DUALSTACK}; then
6879
echo "Use dualstack daemonset for Cilium"
69-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
80+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_IMAGE_NAME_OVERRIDE},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
7081
else
7182
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
7283
fi
@@ -75,7 +86,7 @@ stages:
7586
kubectl get po -owide -A
7687
7788
echo "Deploy Azure-CNS"
78-
sudo -E env "PATH=$PATH" make test-load AZURE_IPAM_VERSION=v$(AZURE_IPAM_VERSION) CNS_ONLY=true CNS_VERSION=v$(CNS_VERSION) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
89+
sudo -E env "PATH=$PATH" make test-load AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_ONLY=true CNS_VERSION=$(CNS_VERSION) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
7990
kubectl get po -owide -A
8091
kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=10m || {
8192
echo "Not all pods ready"

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ steps:
4343
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
4444
4545
export CILIUM_VERSION_TAG=${CILIUM_DUALSTACK_VERSION}
46-
export IPV6_HP_BPF_VERSION=$(IPV6_HP_BPF_VERSION)
47-
export IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io$(IMAGE_REPO_PATH)
46+
[[ -z $IPV6_HP_BPF_VERSION ]] && IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
47+
[[ -z $IPV6_HP_BPF_IMAGE_NAME_OVERRIDE ]] && IPV6_HP_BPF_IMAGE_NAME_OVERRIDE=ipv6-hp-bpf
48+
[[ -z $IPV6_IMAGE_REGISTRY ]] && IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
4849
echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
49-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
50+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_IMAGE_NAME_OVERRIDE},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
5051
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
5152
kubectl get po -owide -A
5253
name: "installCilium"

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ EXE_EXT = .exe
3030
endif
3131

3232
# Interrogate the git repo and set some variables
33-
REPO_ROOT = $(shell git rev-parse --show-toplevel)
33+
REPO_ROOT ?= $(shell git rev-parse --show-toplevel)
3434
REVISION ?= $(shell git rev-parse --short HEAD)
3535
ACN_VERSION ?= $(shell git describe --exclude "azure-ipam*" --exclude "dropgz*" --exclude "zapai*" --exclude "ipv6-hp-bpf*" --tags --always)
3636
IPV6_HP_BPF_VERSION ?= $(notdir $(shell git describe --match "ipv6-hp-bpf*" --tags --always))

‎test/integration/manifests/cilium/v1.14/cilium-agent/templates/daemonset-dualstack.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ spec:
303303
- mountPath: /var/run/cilium
304304
name: cilium-run
305305
- name: start-ipv6-hp-bpf ## TODO make this change across all dualstack cil agents
306-
image: $IPV6_IMAGE_REGISTRY/ipv6-hp-bpf:$IPV6_HP_BPF_VERSION
306+
image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE:$IPV6_HP_BPF_VERSION
307307
imagePullPolicy: IfNotPresent
308308
command: [/ipv6-hp-bpf]
309309
securityContext:

‎test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset-dualstack.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ spec:
320320
name: host-usr-lib
321321
readOnly: true
322322
- name: start-ipv6-hp-bpf
323-
image: acnpublic.azurecr.io/ipv6-hp-bpf:$IPV6_HP_BPF_VERSION
323+
image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE:$IPV6_HP_BPF_VERSION
324324
imagePullPolicy: IfNotPresent
325325
command: [/ipv6-hp-bpf]
326326
securityContext:

‎test/integration/manifests/cilium/v1.17/cilium-agent/templates/daemonset-dualstack.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ spec:
320320
name: host-usr-lib
321321
readOnly: true
322322
- name: start-ipv6-hp-bpf
323-
image: acnpublic.azurecr.io/ipv6-hp-bpf:$IPV6_HP_BPF_VERSION
323+
image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE:$IPV6_HP_BPF_VERSION
324324
imagePullPolicy: IfNotPresent
325325
command: [/ipv6-hp-bpf]
326326
securityContext:

0 commit comments

Comments
 (0)