Skip to content

Commit

Permalink
feat: Use registry.k8s.io/e2e-test-images/agnhost instead of `arsch…
Browse files Browse the repository at this point in the history
…les/xkcd` (#693)
  • Loading branch information
JorTurFer authored Jun 1, 2023
1 parent d6fe14a commit f06f975
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ Previously announced deprecation(s):

### Other

- **General**: Use kubernetes e2e images for e2e test and samples ([#665]https://github.com/kedacore/http-add-on/issues/665)
- **e2e tests**: Use the same e2e system as in core ([#686]https://github.com/kedacore/http-add-on/pull/686)
13 changes: 13 additions & 0 deletions examples/v0.4.0/httpscaledobject.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
kind: HTTPScaledObject
apiVersion: http.keda.sh/v1alpha1
metadata:
name: xkcd
spec:
host: myhost.com
scaleTargetRef:
deployment: xkcd
service: xkcd
port: 8080
replicas:
min: 5
max: 10
14 changes: 14 additions & 0 deletions examples/v0.5.0/httpscaledobject.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
kind: HTTPScaledObject
apiVersion: http.keda.sh/v1alpha1
metadata:
name: xkcd
spec:
hosts:
- myhost.com
scaleTargetRef:
deployment: xkcd
service: xkcd
port: 8080
replicas:
min: 5
max: 10
6 changes: 6 additions & 0 deletions examples/xkcd/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ spec:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.args }}
args:
{{- range $arg := .Values.args }}
- {{ $arg }}
{{- end }}
{{- end }}
ports:
- name: http
containerPort: 8080
Expand Down
7 changes: 5 additions & 2 deletions examples/xkcd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ targetPendingRequests: 200
# chart release namespace
ingressNamespace:
image:
repository: arschles/xkcd
repository: registry.k8s.io/e2e-test-images/agnhost
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "2.45"

args:
- netexec

imagePullSecrets: []
nameOverride: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ spec:
spec:
containers:
- name: {{.DeploymentName}}
image: arschles/xkcd
image: registry.k8s.io/e2e-test-images/agnhost:2.45
args:
- netexec
ports:
- name: http
containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ spec:
spec:
containers:
- name: {{.DeploymentName}}
image: arschles/xkcd
image: registry.k8s.io/e2e-test-images/agnhost:2.45
args:
- netexec
ports:
- name: http
containerPort: 8080
Expand Down
4 changes: 3 additions & 1 deletion tests/checks/internal_service/internal_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ spec:
spec:
containers:
- name: {{.DeploymentName}}
image: arschles/xkcd
image: registry.k8s.io/e2e-test-images/agnhost:2.45
args:
- netexec
ports:
- name: http
containerPort: 8080
Expand Down
4 changes: 3 additions & 1 deletion tests/checks/multiple_hosts/multiple_hosts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ spec:
spec:
containers:
- name: {{.DeploymentName}}
image: arschles/xkcd
image: registry.k8s.io/e2e-test-images/agnhost:2.45
args:
- netexec
ports:
- name: http
containerPort: 8080
Expand Down
4 changes: 3 additions & 1 deletion tests/checks/single_host/single_host_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ spec:
spec:
containers:
- name: {{.DeploymentName}}
image: arschles/xkcd
image: registry.k8s.io/e2e-test-images/agnhost:2.45
args:
- netexec
ports:
- name: http
containerPort: 8080
Expand Down

0 comments on commit f06f975

Please sign in to comment.