Skip to content
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

feat: Use registry.k8s.io/e2e-test-images/agnhost instead of arschles/xkcd #693

Merged
merged 5 commits into from
Jun 1, 2023
Merged

feat: Use registry.k8s.io/e2e-test-images/agnhost instead of arschles/xkcd #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc2eb4e
feat: Add the code for image and use it
JorTurFer May 31, 2023
2d8901c
fix style
JorTurFer May 31, 2023
0f06693
fix style
JorTurFer May 31, 2023
703f111
use k8s images
JorTurFer Jun 1, 2023
d44953d
remove unintended changes
JorTurFer Jun 1, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion tests/checks/ingress_in_app_namespace/ingress_in_app_namespace_test.go
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion tests/checks/ingress_in_keda_namespace/ingress_in_keda_namespace_test.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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