Test env updates
Updated test cases
Updated release name to D Release
Added image push policy when using custom image repo
Updated http proxies to also accept https in proxy requests
Issue-ID: NONRTRIC-486
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I8a4a642ee50f53f7f278dd0963eb1f1b70563bbf
diff --git a/test/simulator-group/httpproxy/app.yaml b/test/simulator-group/httpproxy/app.yaml
index 266eb19..138da71 100644
--- a/test/simulator-group/httpproxy/app.yaml
+++ b/test/simulator-group/httpproxy/app.yaml
@@ -26,5 +26,7 @@
containerPort: $HTTP_PROXY_INTERNAL_PORT
- name: web
containerPort: $HTTP_PROXY_WEB_INTERNAL_PORT
- command: ["mitmweb"]
- args: ["--web-host", "0.0.0.0", "--no-web-open-browser", "-p", "$HTTP_PROXY_INTERNAL_PORT", "--set", "ssl_insecure"]
\ No newline at end of file
+ - name: https
+ containerPort: $HTTP_PROXY_INTERNAL_SECURE_PORT
+ - name: webs
+ containerPort: $HTTP_PROXY_WEB_INTERNAL_SECURE_PORT
\ No newline at end of file
diff --git a/test/simulator-group/httpproxy/docker-compose.yml b/test/simulator-group/httpproxy/docker-compose.yml
index ff4243b..c27ba5e 100644
--- a/test/simulator-group/httpproxy/docker-compose.yml
+++ b/test/simulator-group/httpproxy/docker-compose.yml
@@ -26,10 +26,11 @@
- default
container_name: ${HTTP_PROXY_APP_NAME}
image: ${HTTP_PROXY_IMAGE}
- tty: true
- command: mitmweb --web-host 0.0.0.0 --no-web-open-browser --set ssl_insecure
ports:
+ - ${HTTP_PROXY_EXTERNAL_PORT}:${HTTP_PROXY_INTERNAL_PORT}
+ - ${HTTP_PROXY_EXTERNAL_SECURE_PORT}:${HTTP_PROXY_INTERNAL_SECURE_PORT}
- ${HTTP_PROXY_WEB_EXTERNAL_PORT}:${HTTP_PROXY_WEB_INTERNAL_PORT}
+ - ${HTTP_PROXY_WEB_EXTERNAL_SECURE_PORT}:${HTTP_PROXY_WEB_INTERNAL_SECURE_PORT}
labels:
- "nrttest_app=HTTPPROXY"
- "nrttest_dp=${HTTP_PROXY_DISPLAY_NAME}"
diff --git a/test/simulator-group/httpproxy/svc.yaml b/test/simulator-group/httpproxy/svc.yaml
index 1e3c009..eb8007c 100644
--- a/test/simulator-group/httpproxy/svc.yaml
+++ b/test/simulator-group/httpproxy/svc.yaml
@@ -17,5 +17,13 @@
targetPort: $HTTP_PROXY_WEB_INTERNAL_PORT
protocol: TCP
name: web
+ - port: $HTTP_PROXY_EXTERNAL_SECURE_PORT
+ targetPort: $HTTP_PROXY_INTERNAL_SECURE_PORT
+ protocol: TCP
+ name: https
+ - port: $HTTP_PROXY_WEB_EXTERNAL_SECURE_PORT
+ targetPort: $HTTP_PROXY_WEB_INTERNAL_SECURE_PORT
+ protocol: TCP
+ name: webs
selector:
run: $HTTP_PROXY_APP_NAME
diff --git a/test/simulator-group/kubeproxy/app.yaml b/test/simulator-group/kubeproxy/app.yaml
index b9f6115..cc2fdb3 100644
--- a/test/simulator-group/kubeproxy/app.yaml
+++ b/test/simulator-group/kubeproxy/app.yaml
@@ -26,3 +26,7 @@
containerPort: $KUBE_PROXY_INTERNAL_PORT
- name: web
containerPort: $KUBE_PROXY_WEB_INTERNAL_PORT
+ - name: https
+ containerPort: $KUBE_PROXY_INTERNAL_SECURE_PORT
+ - name: webs
+ containerPort: $KUBE_PROXY_WEB_INTERNAL_SECURE_PORT
\ No newline at end of file
diff --git a/test/simulator-group/kubeproxy/svc.yaml b/test/simulator-group/kubeproxy/svc.yaml
index 51cf745..c92c069 100644
--- a/test/simulator-group/kubeproxy/svc.yaml
+++ b/test/simulator-group/kubeproxy/svc.yaml
@@ -19,5 +19,15 @@
protocol: TCP
name: web
nodePort:
+ - port: $KUBE_PROXY_EXTERNAL_SECURE_PORT
+ targetPort: $KUBE_PROXY_INTERNAL_SECURE_PORT
+ protocol: TCP
+ name: https
+ nodePort:
+ - port: $KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT
+ targetPort: $KUBE_PROXY_WEB_INTERNAL_SECURE_PORT
+ protocol: TCP
+ name: webs
+ nodePort:
selector:
run: $KUBE_PROXY_APP_NAME