Adaptations to execute in multi-node kube cluster
Issue-ID: NONRTRIC-480
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: If0df0a9ab83811f1373f50dc154ad90d830e1321
diff --git a/test/simulator-group/control_panel/app.yaml b/test/simulator-group/control_panel/app.yaml
index a962f3d..2b2b84b 100644
--- a/test/simulator-group/control_panel/app.yaml
+++ b/test/simulator-group/control_panel/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $CONTROL_PANEL_APP_NAME
image: $CONTROL_PANEL_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $CONTROL_PANEL_INTERNAL_PORT
diff --git a/test/simulator-group/control_panel/nginx.conf b/test/simulator-group/control_panel/nginx.conf
index 0014ffb..5b1e895 100644
--- a/test/simulator-group/control_panel/nginx.conf
+++ b/test/simulator-group/control_panel/nginx.conf
@@ -18,7 +18,9 @@
http {
include /etc/nginx/mime.types;
- resolver 127.0.0.11;
+
+ resolver ${CP_NGINX_RESOLVER};
+
server {
listen 8080;
server_name localhost;
diff --git a/test/simulator-group/control_panel/svc.yaml b/test/simulator-group/control_panel/svc.yaml
index 85a4682..61dc5de 100644
--- a/test/simulator-group/control_panel/svc.yaml
+++ b/test/simulator-group/control_panel/svc.yaml
@@ -7,15 +7,17 @@
run: $CONTROL_PANEL_APP_NAME
autotest: CP
spec:
- type: ClusterIP
+ type: NodePort
ports:
- port: $CONTROL_PANEL_EXTERNAL_PORT
targetPort: $CONTROL_PANEL_INTERNAL_PORT
protocol: TCP
name: http
+ nodePort:
- port: $CONTROL_PANEL_EXTERNAL_SECURE_PORT
targetPort: $CONTROL_PANEL_INTERNAL_SECURE_PORT
protocol: TCP
name: https
+ nodePort:
selector:
run: $CONTROL_PANEL_APP_NAME
\ No newline at end of file
diff --git a/test/simulator-group/cr/app.yaml b/test/simulator-group/cr/app.yaml
index 3497b88..0cb36d2 100644
--- a/test/simulator-group/cr/app.yaml
+++ b/test/simulator-group/cr/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $CR_APP_NAME
image: $CR_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $CR_INTERNAL_PORT
diff --git a/test/simulator-group/dmaapmr/app.yaml b/test/simulator-group/dmaapmr/app.yaml
index 50e6943..39756bb 100644
--- a/test/simulator-group/dmaapmr/app.yaml
+++ b/test/simulator-group/dmaapmr/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $MR_DMAAP_KUBE_APP_NAME
image: $ONAP_DMAAPMR_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $MR_INTERNAL_PORT
@@ -77,7 +77,7 @@
containers:
- name: $MR_KAFKA_BWDS_NAME
image: $ONAP_KAFKA_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: 9092
@@ -142,7 +142,7 @@
containers:
- name: $MR_ZOOKEEPER_APP_NAME
image: $ONAP_ZOOKEEPER_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: 2181
diff --git a/test/simulator-group/ecs/app.yaml b/test/simulator-group/ecs/app.yaml
index 640b61d..bc1bad9 100644
--- a/test/simulator-group/ecs/app.yaml
+++ b/test/simulator-group/ecs/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $ECS_APP_NAME
image: $ECS_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $ECS_INTERNAL_PORT
diff --git a/test/simulator-group/httpproxy/app.yaml b/test/simulator-group/httpproxy/app.yaml
index 3e0c8ac..266eb19 100644
--- a/test/simulator-group/httpproxy/app.yaml
+++ b/test/simulator-group/httpproxy/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $HTTP_PROXY_APP_NAME
image: $HTTP_PROXY_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $HTTP_PROXY_INTERNAL_PORT
diff --git a/test/simulator-group/kubeproxy/app.yaml b/test/simulator-group/kubeproxy/app.yaml
index 08241a3..3e6636b 100644
--- a/test/simulator-group/kubeproxy/app.yaml
+++ b/test/simulator-group/kubeproxy/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $KUBE_PROXY_APP_NAME
image: $KUBE_PROXY_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $KUBE_PROXY_INTERNAL_PORT
diff --git a/test/simulator-group/kubeproxy/svc.yaml b/test/simulator-group/kubeproxy/svc.yaml
index 1a11fc4..ea04483 100644
--- a/test/simulator-group/kubeproxy/svc.yaml
+++ b/test/simulator-group/kubeproxy/svc.yaml
@@ -18,5 +18,6 @@
targetPort: $KUBE_PROXY_WEB_INTERNAL_PORT
protocol: TCP
name: web
+ nodePort:
selector:
run: $KUBE_PROXY_APP_NAME
diff --git a/test/simulator-group/mrstub/app.yaml b/test/simulator-group/mrstub/app.yaml
index f29db93..0cf0f51 100644
--- a/test/simulator-group/mrstub/app.yaml
+++ b/test/simulator-group/mrstub/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $MR_STUB_APP_NAME
image: $MRSTUB_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $MR_INTERNAL_PORT
diff --git a/test/simulator-group/ngw/app.yaml b/test/simulator-group/ngw/app.yaml
index c38de9f..9070603 100644
--- a/test/simulator-group/ngw/app.yaml
+++ b/test/simulator-group/ngw/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $NRT_GATEWAY_APP_NAME
image: $NRT_GATEWAY_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $NRT_GATEWAY_INTERNAL_PORT
diff --git a/test/simulator-group/policy_agent/app.yaml b/test/simulator-group/policy_agent/app.yaml
index ddbae37..bbe8fae 100644
--- a/test/simulator-group/policy_agent/app.yaml
+++ b/test/simulator-group/policy_agent/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $POLICY_AGENT_APP_NAME
image: $POLICY_AGENT_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $POLICY_AGENT_INTERNAL_PORT
diff --git a/test/simulator-group/prodstub/app.yaml b/test/simulator-group/prodstub/app.yaml
index 9fb5ad5..b8f27e2 100644
--- a/test/simulator-group/prodstub/app.yaml
+++ b/test/simulator-group/prodstub/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $PROD_STUB_APP_NAME
image: $PROD_STUB_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $PROD_STUB_INTERNAL_PORT
diff --git a/test/simulator-group/rapp_catalogue/app.yaml b/test/simulator-group/rapp_catalogue/app.yaml
index 0c0a26c..65a9f80 100644
--- a/test/simulator-group/rapp_catalogue/app.yaml
+++ b/test/simulator-group/rapp_catalogue/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $RAPP_CAT_APP_NAME
image: $RAPP_CAT_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $RAPP_CAT_INTERNAL_PORT
diff --git a/test/simulator-group/ric/app.yaml b/test/simulator-group/ric/app.yaml
index df5d982..a404039 100644
--- a/test/simulator-group/ric/app.yaml
+++ b/test/simulator-group/ric/app.yaml
@@ -28,7 +28,7 @@
value: "1"
- name: ALLOW_HTTP
value: "true"
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $RIC_SIM_INTERNAL_PORT
diff --git a/test/simulator-group/sdnc/app.yaml b/test/simulator-group/sdnc/app.yaml
index 75e30d4..13d4739 100644
--- a/test/simulator-group/sdnc/app.yaml
+++ b/test/simulator-group/sdnc/app.yaml
@@ -20,7 +20,7 @@
containers:
- name: $SDNC_APP_NAME
image: $SDNC_A1_CONTROLLER_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $SDNC_INTERNAL_PORT
@@ -64,7 +64,7 @@
containers:
- name: $SDNC_DB_APP_NAME
image: $SDNC_DB_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: 3306
diff --git a/test/simulator-group/sdnc/app2.yaml b/test/simulator-group/sdnc/app2.yaml
index 3a0f597..48aeaf9 100644
--- a/test/simulator-group/sdnc/app2.yaml
+++ b/test/simulator-group/sdnc/app2.yaml
@@ -20,7 +20,7 @@
containers:
- name: $SDNC_APP_NAME
image: $SDNC_A1_CONTROLLER_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: $SDNC_INTERNAL_PORT
@@ -80,7 +80,7 @@
containers:
- name: $SDNC_DB_APP_NAME
image: $SDNC_DB_IMAGE
- imagePullPolicy: Never
+ imagePullPolicy: $KUBE_IMAGE_PULL_POLICY
ports:
- name: http
containerPort: 3306