Skip to content

Commit c1e3fe5

Browse files
rackericEric Hernandez
rackeric
authored and
Eric Hernandez
committed
allows for image repos to be set via Environment Variables
 - useful when using a mirrored repo or no access to upstream repos
1 parent 61aa395 commit c1e3fe5

File tree

8 files changed

+40
-18
lines changed

8 files changed

+40
-18
lines changed

‎clusterloader2/testing/load/config.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,11 @@
7474
{{$EXEC_TIMEOUT := DefaultParam .CL2_EXEC_TIMEOUT "3600s"}}
7575
{{$SLEEP_AFTER_EXEC_DURATION := DefaultParam .CL2_SLEEP_AFTER_EXEC_DURATION "0s"}}
7676

77-
{{$registry := DefaultParam .CL2_LATENCY_POD_REGISTRY "registry.k8s.io"}}
78-
{{$latencyPodImage := DefaultParam .CL2_LATENCY_POD_IMAGE (Concat $registry "/pause:3.9")}}
77+
## Image Repositories
78+
{{$registryK8sRepo := DefaultParam .CL2_REGISTRY_K8S_REPO "registry.k8s.io"}}
79+
{{$gcrRepo := DefaultParam .CL2_GCR_REPO "gcr.io"}}
80+
81+
{{$latencyPodImage := DefaultParam .CL2_LATENCY_POD_IMAGE "pause:3.9"}}
7982
{{$defaultQps := DefaultParam .CL2_DEFAULT_QPS (IfThenElse (le .Nodes 500) 10 100)}}
8083

8184
{{$ADDITIONAL_MEASUREMENT_MODULES := DefaultParam .CL2_ADDITIONAL_MEASUREMENT_MODULES nil}}
@@ -190,7 +193,7 @@ steps:
190193
# This way, the pod startup latency we measure excludes (or limits impact) of image pulling,
191194
# whuch matches our SLO definition: https://github.com/kubernetes/community/blob/master/sig-scalability/slos/pod_startup_latency.md.
192195
daemonSetImage: {{$latencyPodImage}}
193-
deploymentImage: {{$latencyPodImage}}
196+
deploymentImage:{{$latencyPodImage}}
194197
jobImage: {{$latencyPodImage}}
195198
statefulSetImage: {{$latencyPodImage}}
196199
daemonSetEnv: "before update"
@@ -211,6 +214,8 @@ steps:
211214
mediumJobsPerNamespace: 1
212215
smallJobSize: {{$SMALL_GROUP_SIZE}}
213216
smallJobsPerNamespace: 1
217+
registryK8sRepo: {{$registryK8sRepo}}
218+
gcrRepo: {{$gcrRepo}}
214219

215220
{{if $ADDITIONAL_PHASES_MODULES}}
216221
{{range $ADDITIONAL_PHASES_MODULES}}
@@ -232,6 +237,7 @@ steps:
232237
schedulerThroughputNamespaces: {{$schedulerThroughputNamespaces}}
233238
schedulerThroughputPodsPerDeployment: {{$schedulerThroughputPodsPerDeployment}}
234239
deploymentImage: {{$latencyPodImage}}
240+
registryK8sRepo: {{$registryK8sRepo}}
235241
{{end}}
236242

237243
- module:
@@ -356,6 +362,8 @@ steps:
356362
mediumJobsPerNamespace: 1
357363
smallJobSize: {{$SMALL_GROUP_SIZE}}
358364
smallJobsPerNamespace: 1
365+
registryK8sRepo: {{$registryK8sRepo}}
366+
gcrRepo: {{$gcrRepo}}
359367

360368
{{if $ADDITIONAL_PHASES_MODULES}}
361369
{{range $ADDITIONAL_PHASES_MODULES}}
@@ -402,6 +410,8 @@ steps:
402410
smallJobsPerNamespace: 0
403411
pvSmallStatefulSetSize: {{$SMALL_STATEFUL_SETS_PER_NAMESPACE}}
404412
pvMediumStatefulSetSize: {{$MEDIUM_STATEFUL_SETS_PER_NAMESPACE}}
413+
registryK8sRepo: {{$registryK8sRepo}}
414+
gcrRepo: {{$gcrRepo}}
405415

406416
{{if $ADDITIONAL_PHASES_MODULES}}
407417
{{range $ADDITIONAL_PHASES_MODULES}}

‎clusterloader2/testing/load/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{{$HostNetworkMode := DefaultParam .CL2_USE_HOST_NETWORK_PODS false}}
2-
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
32
{{$Env := DefaultParam .Env ""}}
43
{{$DaemonSetSurge := DefaultParam .CL2_DS_SURGE (MaxInt 10 (DivideInt .Nodes 20))}} # 5% of nodes, but not less than 10
54
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
@@ -29,7 +28,7 @@ spec:
2928
hostNetwork: {{$HostNetworkMode}}
3029
containers:
3130
- name: {{.Name}}
32-
image: {{$Image}}
31+
image: {{.RegistryK8sRepo}}/pause:3.9
3332
env:
3433
- name: TEST_ENV
3534
value: {{$Env}}

‎clusterloader2/testing/load/deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{$NetPolServerOnEveryNthPod := DefaultParam .NetPolServerOnEveryNthPod 3}}
1616
{{$RunNetPolicyTest := and $EnableNetworkPolicyEnforcementLatencyTest (eq (Mod .Index $NetPolServerOnEveryNthPod) 0)}}
1717

18-
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
18+
{{$Image := DefaultParam .Image "pause:3.9"}}
1919

2020
apiVersion: apps/v1
2121
kind: Deployment
@@ -47,13 +47,13 @@ spec:
4747
containers:
4848
{{if .EnableDNSTests}}
4949
{{if $USE_ADVANCED_DNSTEST}}
50-
- image: gcr.io/k8s-staging-perf-tests/dnsperfgo:v1.4.0
50+
- image: {{.GcrRepo}}/k8s-staging-perf-tests/dnsperfgo:v1.4.0
5151
ports:
5252
- containerPort: 9153
5353
name: dnsperfmetrics
5454
protocol: TCP
5555
{{else}}
56-
- image: gcr.io/k8s-staging-perf-tests/dnsperfgo:v1.2.0
56+
- image: {{.GcrRepo}}/k8s-staging-perf-tests/dnsperfgo:v1.2.0
5757
{{end}}
5858
# Fetches the dns server from /etc/resolv.conf and
5959
# sends 1 query per second.
@@ -74,7 +74,7 @@ spec:
7474
ports:
7575
- containerPort: 80
7676
{{else}}
77-
- image: {{$Image}}
77+
- image: {{.RegistryK8sRepo}}/{{$Image}}
7878
name: {{.Name}}
7979
{{end}}
8080
{{end}}

‎clusterloader2/testing/load/job.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{$HostNetworkMode := DefaultParam .CL2_USE_HOST_NETWORK_PODS false}}
22
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
3-
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
3+
{{$Image := DefaultParam .Image "pause:3.9"}}
44

55
apiVersion: batch/v1
66
kind: Job
@@ -26,7 +26,7 @@ spec:
2626
containers:
2727
- name: {{.Name}}
2828
# TODO(#799): We should test the "run-to-completion" workflow and hence don't use pause pods.
29-
image: {{$Image}}
29+
image: {{.RegistryK8sRepo}}/{{$Image}}
3030
resources:
3131
# Keep the CpuRequest/MemoryRequest request equal percentage of 1-core, 4GB node.
3232
# For now we're setting it to 0.5%.

‎clusterloader2/testing/load/modules/reconcile-objects.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{{$operationTimeout := .operationTimeout}}
1414

1515
# DaemonSets
16-
{{$daemonSetImage := DefaultParam .daemonSetImage "registry.k8s.io/pause:3.9"}}
16+
{{$daemonSetImage := DefaultParam .daemonSetImage "$registryK8sRepo/pause:3.9"}}
1717
{{$daemonSetReplicas := .daemonSetReplicas}}
1818
{{$daemonSetEnv := .daemonSetEnv}}
1919

@@ -58,6 +58,9 @@
5858
{{$NET_POLICY_ENFORCEMENT_LATENCY_TARGET_LABEL_VALUE := DefaultParam .CL2_NET_POLICY_ENFORCEMENT_LATENCY_TARGET_LABEL_VALUE "enforcement-latency"}}
5959
{{$NET_POLICY_SERVER_EVERY_NTH_POD := DefaultParam .CL2_NET_POLICY_SERVER_EVERY_NTH_POD 3}}
6060

61+
{{$registryK8sRepo := .registryK8sRepo}}
62+
{{$gcrRepo := .gcrRepo}}
63+
6164
steps:
6265
- name: Starting measurement for '{{$actionName}}'
6366
measurements:
@@ -99,6 +102,7 @@ steps:
99102
templateFillMap:
100103
Image: {{$daemonSetImage}}
101104
Env: {{$daemonSetEnv}}
105+
RegistryK8sRepo: {{$registryK8sRepo}}
102106
{{end}}
103107
- namespaceRange:
104108
min: 1
@@ -119,6 +123,7 @@ steps:
119123
ReplicasMax: {{MultiplyInt $bigDeploymentSize $maxReplicaFactor}}
120124
SvcName: big-service
121125
Image: {{$deploymentImage}}
126+
RegistryK8sRepo: {{$registryK8sRepo}}
122127
- namespaceRange:
123128
min: 1
124129
max: {{$namespaces}}
@@ -137,6 +142,7 @@ steps:
137142
ReplicasMax: {{MultiplyInt $mediumDeploymentSize $maxReplicaFactor}}
138143
SvcName: medium-service
139144
Image: {{$deploymentImage}}
145+
RegistryK8sRepo: {{$registryK8sRepo}}
140146
- namespaceRange:
141147
min: 1
142148
max: {{$namespaces}}
@@ -160,6 +166,8 @@ steps:
160166
TargetLabelValue: {{$NET_POLICY_ENFORCEMENT_LATENCY_TARGET_LABEL_VALUE}}
161167
NetPolServerOnEveryNthPod: {{$NET_POLICY_SERVER_EVERY_NTH_POD}}
162168
Image: {{$deploymentImage}}
169+
RegistryK8sRepo: {{$registryK8sRepo}}
170+
GcrRepo: {{$gcrRepo}}
163171
- namespaceRange:
164172
min: 1
165173
max: {{$namespaces}}
@@ -174,6 +182,7 @@ steps:
174182
ReplicasMin: {{MultiplyInt $smallStatefulSetSize $minReplicaFactor}}
175183
ReplicasMax: {{MultiplyInt $smallStatefulSetSize $maxReplicaFactor}}
176184
Image: {{$statefulSetImage}}
185+
RegistryK8sRepo: {{$registryK8sRepo}}
177186
- namespaceRange:
178187
min: 1
179188
max: {{$namespaces}}
@@ -188,6 +197,7 @@ steps:
188197
ReplicasMin: {{MultiplyInt $mediumStatefulSetSize $minReplicaFactor}}
189198
ReplicasMax: {{MultiplyInt $mediumStatefulSetSize $maxReplicaFactor}}
190199
Image: {{$statefulSetImage}}
200+
RegistryK8sRepo: {{$registryK8sRepo}}
191201
- namespaceRange:
192202
min: 1
193203
max: {{$namespaces}}
@@ -201,6 +211,7 @@ steps:
201211
ReplicasMin: {{MultiplyInt $smallJobSize $minReplicaFactor}}
202212
ReplicasMax: {{MultiplyInt $smallJobSize $maxReplicaFactor}}
203213
Image: {{$jobImage}}
214+
RegistryK8sRepo: {{$registryK8sRepo}}
204215
- namespaceRange:
205216
min: 1
206217
max: {{$namespaces}}
@@ -214,6 +225,7 @@ steps:
214225
ReplicasMin: {{MultiplyInt $mediumJobSize $minReplicaFactor}}
215226
ReplicasMax: {{MultiplyInt $mediumJobSize $maxReplicaFactor}}
216227
Image: {{$jobImage}}
228+
RegistryK8sRepo: {{$registryK8sRepo}}
217229
- namespaceRange:
218230
min: 1
219231
max: {{$namespaces}}
@@ -227,6 +239,7 @@ steps:
227239
ReplicasMin: {{MultiplyInt $bigJobSize $minReplicaFactor}}
228240
ReplicasMax: {{MultiplyInt $bigJobSize $maxReplicaFactor}}
229241
Image: {{$jobImage}}
242+
RegistryK8sRepo: {{$registryK8sRepo}}
230243
{{if and $is_deleting $ENABLE_PVS}}
231244
- namespaceRange:
232245
min: 1

‎clusterloader2/testing/load/modules/scheduler-throughput.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
{{$CHECK_IF_PODS_ARE_UPDATED := DefaultParam .CL2_CHECK_IF_PODS_ARE_UPDATED true}}
1515

1616

17-
{{$deploymentImage := DefaultParam .deploymentImage "registry.k8s.io/pause:3.9"}}
17+
{{$deploymentImage := DefaultParam .deploymentImage "pause:3.9"}}
18+
{{$registryK8sRepo := .registryK8sRepo}}
1819

1920
steps:
2021
{{if $is_creating}}
@@ -57,7 +58,7 @@ steps:
5758
templateFillMap:
5859
Replicas: {{$schedulerThroughputPodsPerDeployment}}
5960
Group: scheduler-throughput
60-
Image: {{$deploymentImage}}
61+
Image: {{$registryK8sRepo}}/{{$deploymentImage}}
6162
- name: Waiting for scheduler throughput pods to be {{$action}}d
6263
measurements:
6364
- Identifier: WaitForSchedulerThroughputDeployments

‎clusterloader2/testing/load/simple-deployment.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
{{$CpuRequest := DefaultParam .CpuRequest "5m"}}
55
{{$EnvVar := DefaultParam .EnvVar "a"}}
66
{{$MemoryRequest := DefaultParam .MemoryRequest "20M"}}
7-
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
87
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
98

109
apiVersion: apps/v1
@@ -32,7 +31,7 @@ spec:
3231
- env:
3332
- name: ENV_VAR
3433
value: {{$EnvVar}}
35-
image: {{$Image}}
34+
image: {{.Image}}
3635
imagePullPolicy: IfNotPresent
3736
name: {{.Name}}
3837
ports:

‎clusterloader2/testing/load/statefulset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{$HostNetworkMode := DefaultParam .CL2_USE_HOST_NETWORK_PODS false}}
22
{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS true}}
33
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
4-
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
4+
{{$Image := DefaultParam .Image "pause:3.9"}}
55

66
apiVersion: apps/v1
77
kind: StatefulSet
@@ -26,7 +26,7 @@ spec:
2626
hostNetwork: {{$HostNetworkMode}}
2727
containers:
2828
- name: {{.Name}}
29-
image: {{$Image}}
29+
image: {{.RegistryK8sRepo}}/{{$Image}}
3030
ports:
3131
- containerPort: 80
3232
name: web

0 commit comments

Comments
 (0)