Skip to content

Commit f06f975

Browse files
authored
feat: Use registry.k8s.io/e2e-test-images/agnhost instead of arschles/xkcd (#693)
1 parent d6fe14a commit f06f975

File tree

10 files changed

+54
-7
lines changed

10 files changed

+54
-7
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@ Previously announced deprecation(s):
4646

4747
### Other
4848

49+
- **General**: Use kubernetes e2e images for e2e test and samples ([#665]https://github.com/kedacore/http-add-on/issues/665)
4950
- **e2e tests**: Use the same e2e system as in core ([#686]https://github.com/kedacore/http-add-on/pull/686)

examples/v0.4.0/httpscaledobject.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
kind: HTTPScaledObject
2+
apiVersion: http.keda.sh/v1alpha1
3+
metadata:
4+
name: xkcd
5+
spec:
6+
host: myhost.com
7+
scaleTargetRef:
8+
deployment: xkcd
9+
service: xkcd
10+
port: 8080
11+
replicas:
12+
min: 5
13+
max: 10

examples/v0.5.0/httpscaledobject.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
kind: HTTPScaledObject
2+
apiVersion: http.keda.sh/v1alpha1
3+
metadata:
4+
name: xkcd
5+
spec:
6+
hosts:
7+
- myhost.com
8+
scaleTargetRef:
9+
deployment: xkcd
10+
service: xkcd
11+
port: 8080
12+
replicas:
13+
min: 5
14+
max: 10

examples/xkcd/templates/deployment.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ spec:
3030
{{- toYaml .Values.securityContext | nindent 12 }}
3131
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
3232
imagePullPolicy: {{ .Values.image.pullPolicy }}
33+
{{- if .Values.args }}
34+
args:
35+
{{- range $arg := .Values.args }}
36+
- {{ $arg }}
37+
{{- end }}
38+
{{- end }}
3339
ports:
3440
- name: http
3541
containerPort: 8080

examples/xkcd/values.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ targetPendingRequests: 200
99
# chart release namespace
1010
ingressNamespace:
1111
image:
12-
repository: arschles/xkcd
12+
repository: registry.k8s.io/e2e-test-images/agnhost
1313
pullPolicy: Always
1414
# Overrides the image tag whose default is the chart appVersion.
15-
tag: "latest"
15+
tag: "2.45"
16+
17+
args:
18+
- netexec
1619

1720
imagePullSecrets: []
1821
nameOverride: ""

tests/checks/ingress_in_app_namespace/ingress_in_app_namespace_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ spec:
116116
spec:
117117
containers:
118118
- name: {{.DeploymentName}}
119-
image: arschles/xkcd
119+
image: registry.k8s.io/e2e-test-images/agnhost:2.45
120+
args:
121+
- netexec
120122
ports:
121123
- name: http
122124
containerPort: 8080

tests/checks/ingress_in_keda_namespace/ingress_in_keda_namespace_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ spec:
104104
spec:
105105
containers:
106106
- name: {{.DeploymentName}}
107-
image: arschles/xkcd
107+
image: registry.k8s.io/e2e-test-images/agnhost:2.45
108+
args:
109+
- netexec
108110
ports:
109111
- name: http
110112
containerPort: 8080

tests/checks/internal_service/internal_service_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ spec:
7676
spec:
7777
containers:
7878
- name: {{.DeploymentName}}
79-
image: arschles/xkcd
79+
image: registry.k8s.io/e2e-test-images/agnhost:2.45
80+
args:
81+
- netexec
8082
ports:
8183
- name: http
8284
containerPort: 8080

tests/checks/multiple_hosts/multiple_hosts_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ spec:
7979
spec:
8080
containers:
8181
- name: {{.DeploymentName}}
82-
image: arschles/xkcd
82+
image: registry.k8s.io/e2e-test-images/agnhost:2.45
83+
args:
84+
- netexec
8385
ports:
8486
- name: http
8587
containerPort: 8080

tests/checks/single_host/single_host_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ spec:
7676
spec:
7777
containers:
7878
- name: {{.DeploymentName}}
79-
image: arschles/xkcd
79+
image: registry.k8s.io/e2e-test-images/agnhost:2.45
80+
args:
81+
- netexec
8082
ports:
8183
- name: http
8284
containerPort: 8080

0 commit comments

Comments
 (0)