Merge branch 'main' into pedrotorres/issue-605

Author: t0rr3sp3dr0

CHANGELOG.md

@@ -47,4 +47,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)

Makefile

@@ -102,7 +102,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) crd rbac:roleName='interceptor' webhook paths='./interceptor/...' output:rbac:artifacts:config='config/interceptor'
 
 verify-manifests: ## Verify manifests are up to date.
-	./hack/verify-codegen.sh
+	./hack/verify-manifests.sh
 
 mockgen: ## Generate mock implementations of Go interfaces.
 	./hack/update-mockgen.sh

examples/v0.4.0/httpscaledobject.yaml

@@ -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

examples/v0.5.0/httpscaledobject.yaml

@@ -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

examples/xkcd/templates/deployment.yaml

@@ -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

examples/xkcd/values.yaml

@@ -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: ""

hack/verify-manifests.sh

@@ -36,7 +36,7 @@ mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
 make manifests
-echo "diffing ${DIFFROOT} against freshly generated codegen"
+echo "diffing ${DIFFROOT} against freshly generated manifests"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
 cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}"

tests/checks/ingress_in_app_namespace/ingress_in_app_namespace_test.go

@@ -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

tests/checks/ingress_in_keda_namespace/ingress_in_keda_namespace_test.go

@@ -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

tests/checks/internal_service/internal_service_test.go

@@ -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

tests/checks/multiple_hosts/multiple_hosts_test.go

@@ -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

tests/checks/single_host/single_host_test.go

@@ -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