Skip to content

allows for image repos to be set via Environment Variables #2705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

allows for image repos to be set via Environment Variables #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions clusterloader2/testing/load/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@
{{$EXEC_TIMEOUT := DefaultParam .CL2_EXEC_TIMEOUT "3600s"}}
{{$SLEEP_AFTER_EXEC_DURATION := DefaultParam .CL2_SLEEP_AFTER_EXEC_DURATION "0s"}}

{{$registry := DefaultParam .CL2_LATENCY_POD_REGISTRY "registry.k8s.io"}}
{{$latencyPodImage := DefaultParam .CL2_LATENCY_POD_IMAGE (Concat $registry "/pause:3.9")}}
## Image Repositories
{{$registryK8sRepo := DefaultParam .CL2_REGISTRY_K8S_REPO "registry.k8s.io"}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{$registryK8sRepo := DefaultParam .CL2_REGISTRY_K8S_REPO "registry.k8s.io"}}
{{$imageRegistry := DefaultParam .CL2_REGISTRY_K8S_REPO "registry.k8s.io"}}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I gave this a more descriptive name, registryK8sRepo, since there are 2 image registries used and I thought it would help highlight which repo exactly was being specified.

{{$gcrRepo := DefaultParam .CL2_GCR_REPO "gcr.io"}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field and above seem different registries for different images, I'll defer to this repository's maintainers here, but maybe we should try to find some naming that clarifies a bit more where they're set?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, I'll take any suggestion made from the code owners.


{{$latencyPodImage := DefaultParam .CL2_LATENCY_POD_IMAGE "pause:3.9"}}
{{$defaultQps := DefaultParam .CL2_DEFAULT_QPS (IfThenElse (le .Nodes 500) 10 100)}}

{{$ADDITIONAL_MEASUREMENT_MODULES := DefaultParam .CL2_ADDITIONAL_MEASUREMENT_MODULES nil}}
Expand Down Expand Up @@ -211,6 +214,8 @@ steps:
mediumJobsPerNamespace: 1
smallJobSize: {{$SMALL_GROUP_SIZE}}
smallJobsPerNamespace: 1
registryK8sRepo: {{$registryK8sRepo}}
gcrRepo: {{$gcrRepo}}

{{if $ADDITIONAL_PHASES_MODULES}}
{{range $ADDITIONAL_PHASES_MODULES}}
Expand All @@ -232,6 +237,7 @@ steps:
schedulerThroughputNamespaces: {{$schedulerThroughputNamespaces}}
schedulerThroughputPodsPerDeployment: {{$schedulerThroughputPodsPerDeployment}}
deploymentImage: {{$latencyPodImage}}
registryK8sRepo: {{$registryK8sRepo}}
{{end}}

- module:
Expand Down Expand Up @@ -356,6 +362,8 @@ steps:
mediumJobsPerNamespace: 1
smallJobSize: {{$SMALL_GROUP_SIZE}}
smallJobsPerNamespace: 1
registryK8sRepo: {{$registryK8sRepo}}
gcrRepo: {{$gcrRepo}}

{{if $ADDITIONAL_PHASES_MODULES}}
{{range $ADDITIONAL_PHASES_MODULES}}
Expand Down Expand Up @@ -402,6 +410,8 @@ steps:
smallJobsPerNamespace: 0
pvSmallStatefulSetSize: {{$SMALL_STATEFUL_SETS_PER_NAMESPACE}}
pvMediumStatefulSetSize: {{$MEDIUM_STATEFUL_SETS_PER_NAMESPACE}}
registryK8sRepo: {{$registryK8sRepo}}
gcrRepo: {{$gcrRepo}}

{{if $ADDITIONAL_PHASES_MODULES}}
{{range $ADDITIONAL_PHASES_MODULES}}
Expand Down
3 changes: 1 addition & 2 deletions clusterloader2/testing/load/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{$HostNetworkMode := DefaultParam .CL2_USE_HOST_NETWORK_PODS false}}
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
{{$Env := DefaultParam .Env ""}}
{{$DaemonSetSurge := DefaultParam .CL2_DS_SURGE (MaxInt 10 (DivideInt .Nodes 20))}} # 5% of nodes, but not less than 10
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
Expand Down Expand Up @@ -29,7 +28,7 @@ spec:
hostNetwork: {{$HostNetworkMode}}
containers:
- name: {{.Name}}
image: {{$Image}}
image: {{.RegistryK8sRepo}}/pause:3.9
env:
- name: TEST_ENV
value: {{$Env}}
Expand Down
8 changes: 4 additions & 4 deletions clusterloader2/testing/load/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{$NetPolServerOnEveryNthPod := DefaultParam .NetPolServerOnEveryNthPod 3}}
{{$RunNetPolicyTest := and $EnableNetworkPolicyEnforcementLatencyTest (eq (Mod .Index $NetPolServerOnEveryNthPod) 0)}}

{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
{{$Image := DefaultParam .Image "pause:3.9"}}

apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -47,13 +47,13 @@ spec:
containers:
{{if .EnableDNSTests}}
{{if $USE_ADVANCED_DNSTEST}}
- image: gcr.io/k8s-staging-perf-tests/dnsperfgo:v1.4.0
- image: {{.GcrRepo}}/k8s-staging-perf-tests/dnsperfgo:v1.4.0
ports:
- containerPort: 9153
name: dnsperfmetrics
protocol: TCP
{{else}}
- image: gcr.io/k8s-staging-perf-tests/dnsperfgo:v1.2.0
- image: {{.GcrRepo}}/k8s-staging-perf-tests/dnsperfgo:v1.2.0
{{end}}
# Fetches the dns server from /etc/resolv.conf and
# sends 1 query per second.
Expand All @@ -74,7 +74,7 @@ spec:
ports:
- containerPort: 80
{{else}}
- image: {{$Image}}
- image: {{.RegistryK8sRepo}}/{{$Image}}
name: {{.Name}}
{{end}}
{{end}}
Expand Down
4 changes: 2 additions & 2 deletions clusterloader2/testing/load/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{$HostNetworkMode := DefaultParam .CL2_USE_HOST_NETWORK_PODS false}}
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
{{$Image := DefaultParam .Image "pause:3.9"}}

apiVersion: batch/v1
kind: Job
Expand All @@ -26,7 +26,7 @@ spec:
containers:
- name: {{.Name}}
# TODO(#799): We should test the "run-to-completion" workflow and hence don't use pause pods.
image: {{$Image}}
image: {{.RegistryK8sRepo}}/{{$Image}}
resources:
# Keep the CpuRequest/MemoryRequest request equal percentage of 1-core, 4GB node.
# For now we're setting it to 0.5%.
Expand Down
15 changes: 14 additions & 1 deletion clusterloader2/testing/load/modules/reconcile-objects.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{{$operationTimeout := .operationTimeout}}

# DaemonSets
{{$daemonSetImage := DefaultParam .daemonSetImage "registry.k8s.io/pause:3.9"}}
{{$daemonSetImage := DefaultParam .daemonSetImage "$registryK8sRepo/pause:3.9"}}
{{$daemonSetReplicas := .daemonSetReplicas}}
{{$daemonSetEnv := .daemonSetEnv}}

Expand Down Expand Up @@ -58,6 +58,9 @@
{{$NET_POLICY_ENFORCEMENT_LATENCY_TARGET_LABEL_VALUE := DefaultParam .CL2_NET_POLICY_ENFORCEMENT_LATENCY_TARGET_LABEL_VALUE "enforcement-latency"}}
{{$NET_POLICY_SERVER_EVERY_NTH_POD := DefaultParam .CL2_NET_POLICY_SERVER_EVERY_NTH_POD 3}}

{{$registryK8sRepo := .registryK8sRepo}}
{{$gcrRepo := .gcrRepo}}

steps:
- name: Starting measurement for '{{$actionName}}'
measurements:
Expand Down Expand Up @@ -99,6 +102,7 @@ steps:
templateFillMap:
Image: {{$daemonSetImage}}
Env: {{$daemonSetEnv}}
RegistryK8sRepo: {{$registryK8sRepo}}
{{end}}
- namespaceRange:
min: 1
Expand All @@ -119,6 +123,7 @@ steps:
ReplicasMax: {{MultiplyInt $bigDeploymentSize $maxReplicaFactor}}
SvcName: big-service
Image: {{$deploymentImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -137,6 +142,7 @@ steps:
ReplicasMax: {{MultiplyInt $mediumDeploymentSize $maxReplicaFactor}}
SvcName: medium-service
Image: {{$deploymentImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -160,6 +166,8 @@ steps:
TargetLabelValue: {{$NET_POLICY_ENFORCEMENT_LATENCY_TARGET_LABEL_VALUE}}
NetPolServerOnEveryNthPod: {{$NET_POLICY_SERVER_EVERY_NTH_POD}}
Image: {{$deploymentImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
GcrRepo: {{$gcrRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -174,6 +182,7 @@ steps:
ReplicasMin: {{MultiplyInt $smallStatefulSetSize $minReplicaFactor}}
ReplicasMax: {{MultiplyInt $smallStatefulSetSize $maxReplicaFactor}}
Image: {{$statefulSetImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -188,6 +197,7 @@ steps:
ReplicasMin: {{MultiplyInt $mediumStatefulSetSize $minReplicaFactor}}
ReplicasMax: {{MultiplyInt $mediumStatefulSetSize $maxReplicaFactor}}
Image: {{$statefulSetImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -201,6 +211,7 @@ steps:
ReplicasMin: {{MultiplyInt $smallJobSize $minReplicaFactor}}
ReplicasMax: {{MultiplyInt $smallJobSize $maxReplicaFactor}}
Image: {{$jobImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -214,6 +225,7 @@ steps:
ReplicasMin: {{MultiplyInt $mediumJobSize $minReplicaFactor}}
ReplicasMax: {{MultiplyInt $mediumJobSize $maxReplicaFactor}}
Image: {{$jobImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
- namespaceRange:
min: 1
max: {{$namespaces}}
Expand All @@ -227,6 +239,7 @@ steps:
ReplicasMin: {{MultiplyInt $bigJobSize $minReplicaFactor}}
ReplicasMax: {{MultiplyInt $bigJobSize $maxReplicaFactor}}
Image: {{$jobImage}}
RegistryK8sRepo: {{$registryK8sRepo}}
{{if and $is_deleting $ENABLE_PVS}}
- namespaceRange:
min: 1
Expand Down
5 changes: 3 additions & 2 deletions clusterloader2/testing/load/modules/scheduler-throughput.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
{{$CHECK_IF_PODS_ARE_UPDATED := DefaultParam .CL2_CHECK_IF_PODS_ARE_UPDATED true}}


{{$deploymentImage := DefaultParam .deploymentImage "registry.k8s.io/pause:3.9"}}
{{$deploymentImage := DefaultParam .deploymentImage "pause:3.9"}}
{{$registryK8sRepo := .registryK8sRepo}}

steps:
{{if $is_creating}}
Expand Down Expand Up @@ -57,7 +58,7 @@ steps:
templateFillMap:
Replicas: {{$schedulerThroughputPodsPerDeployment}}
Group: scheduler-throughput
Image: {{$deploymentImage}}
Image: {{$registryK8sRepo}}/{{$deploymentImage}}
- name: Waiting for scheduler throughput pods to be {{$action}}d
measurements:
- Identifier: WaitForSchedulerThroughputDeployments
Expand Down
3 changes: 1 addition & 2 deletions clusterloader2/testing/load/simple-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{{$CpuRequest := DefaultParam .CpuRequest "5m"}}
{{$EnvVar := DefaultParam .EnvVar "a"}}
{{$MemoryRequest := DefaultParam .MemoryRequest "20M"}}
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}

apiVersion: apps/v1
Expand Down Expand Up @@ -32,7 +31,7 @@ spec:
- env:
- name: ENV_VAR
value: {{$EnvVar}}
image: {{$Image}}
image: {{.Image}}
imagePullPolicy: IfNotPresent
name: {{.Name}}
ports:
Expand Down
4 changes: 2 additions & 2 deletions clusterloader2/testing/load/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{$HostNetworkMode := DefaultParam .CL2_USE_HOST_NETWORK_PODS false}}
{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS true}}
{{$RUN_ON_ARM_NODES := DefaultParam .CL2_RUN_ON_ARM_NODES false}}
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.9"}}
{{$Image := DefaultParam .Image "pause:3.9"}}

apiVersion: apps/v1
kind: StatefulSet
Expand All @@ -26,7 +26,7 @@ spec:
hostNetwork: {{$HostNetworkMode}}
containers:
- name: {{.Name}}
image: {{$Image}}
image: {{.RegistryK8sRepo}}/{{$Image}}
ports:
- containerPort: 80
name: web
Expand Down