summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d477ffd)
Issue-ID: NONRTRIC-980
Change-Id: I48f8709e9cef1d6cbd010f50b7981782dbeddba7
Signed-off-by: DenisGNoonan <denis.noonan@est.tech>
14 files changed:
echo "Installing Kong"
helm repo add kong https://charts.konghq.com --force-update
helm repo update
echo "Installing Kong"
helm repo add kong https://charts.konghq.com --force-update
helm repo update
- helm install kong-nonrtric kong/kong -n ${NONRTRIC_NAMESPACE:-nonrtric} -f dep/nonrtric/helm/kongstorage/kongvalues.yaml
+ helm install oran-nonrtric kong/kong -n ${NONRTRIC_NAMESPACE:-nonrtric} -f dep/nonrtric/helm/kongstorage/kongvalues.yaml
fi
kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --from-file=recipe=$OVERRIDEYAML
fi
kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --from-file=recipe=$OVERRIDEYAML
echo "Uninstalling kongstorage"
helm delete kongstorage -n "${NONRTRIC_NAMESPACE:-nonrtric}"
echo "Uninstalling Kong"
echo "Uninstalling kongstorage"
helm delete kongstorage -n "${NONRTRIC_NAMESPACE:-nonrtric}"
echo "Uninstalling Kong"
- helm delete kong-nonrtric -n ${NONRTRIC_NAMESPACE:-nonrtric}
+ helm delete oran-nonrtric -n ${NONRTRIC_NAMESPACE:-nonrtric}
fi
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
fi
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
service:
allowHttp: true
httpName: http
service:
allowHttp: true
httpName: http
targetPort1: 8081
httpsName: https
targetPort1: 8081
httpsName: https
targetPort2: 8433
liveness:
initialDelaySeconds: 20
targetPort2: 8433
liveness:
initialDelaySeconds: 20
# one policy-type and one policy in a1-sim-STD2_0
policy_agent_host="policymanagementservice"
# one policy-type and one policy in a1-sim-STD2_0
policy_agent_host="policymanagementservice"
-policy_agent_port="9080"
+policy_agent_port="8081"
a1_sim_osc_0_host="a1-sim-osc-0.a1-sim"
a1_sim_osc_0_port="8085"
a1_sim_osc_1_host="a1-sim-osc-1.a1-sim"
a1_sim_osc_0_host="a1-sim-osc-0.a1-sim"
a1_sim_osc_0_port="8085"
a1_sim_osc_1_host="a1-sim-osc-1.a1-sim"
include /etc/nginx/mime.types;
upstream backend {
include /etc/nginx/mime.types;
upstream backend {
- server kong-proxy.kong:80;
+ server oran-nonrtric-kong-proxy.nonrtric:80;
try_files $uri $uri/ /index.html;
}
}
try_files $uri $uri/ /index.html;
}
}
-}
\ No newline at end of file
targetPort1: 8080
externalPort1: 30091
httpsName: https
targetPort1: 8080
externalPort1: 30091
httpsName: https
targetPort2: 8082
externalPort2: 30092
liveness:
targetPort2: 8082
externalPort2: 30092
liveness:
wiretap: true
routes:
- id: A1-Policy
wiretap: true
routes:
- id: A1-Policy
- uri: https://policymanagementservice:9081
+ uri: https://policymanagementservice:8433
predicates:
- Path=/a1-policy/**
- id: A1-EI
predicates:
- Path=/a1-policy/**
- id: A1-EI
service:
allowHttp: true
httpName: http
service:
allowHttp: true
httpName: http
targetPort1: 8081
httpsName: https
targetPort1: 8081
httpsName: https
targetPort2: 8433
liveness:
initialDelaySeconds: 20
targetPort2: 8433
liveness:
initialDelaySeconds: 20
.env: |
# The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
# In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
.env: |
# The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
# In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
- # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
+ # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
KONG_DOMAIN: "kong"
KONG_PROTOCOL: "http"
KONG_DOMAIN: "kong"
KONG_PROTOCOL: "http"
- KONG_CONTROL_PLANE_IPV4: "kong-nonrtric-kong-admin.nonrtric.svc.cluster.local"
+ KONG_CONTROL_PLANE_IPV4: "oran-nonrtric-kong-admin.nonrtric.svc.cluster.local"
KONG_CONTROL_PLANE_PORT: "8001"
KONG_CONTROL_PLANE_PORT: "8001"
- KONG_DATA_PLANE_IPV4: "kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local"
+ KONG_DATA_PLANE_IPV4: "oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local"
KONG_DATA_PLANE_PORT: "80"
CAPIF_PROTOCOL: "http"
CAPIF_IPV4: "capifcore.nonrtric.svc.cluster.local"
KONG_DATA_PLANE_PORT: "80"
CAPIF_PROTOCOL: "http"
CAPIF_IPV4: "capifcore.nonrtric.svc.cluster.local"
http {
include /etc/nginx/mime.types;
http {
include /etc/nginx/mime.types;
- server kong-proxy.kong:80;
+ server oran-nonrtric-kong-proxy.nonrtric:80;
server {
listen 8080;
server_name localhost;
server {
listen 8080;
server_name localhost;
.env: |
# The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
# In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
.env: |
# The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
# In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
- # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
+ # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
KONG_DOMAIN: "kong"
KONG_PROTOCOL: "http"
KONG_CONTROL_PLANE_IPV4: "oran-nonrtric-kong-admin.nonrtric.svc.cluster.local"
KONG_DOMAIN: "kong"
KONG_PROTOCOL: "http"
KONG_CONTROL_PLANE_IPV4: "oran-nonrtric-kong-admin.nonrtric.svc.cluster.local"
a1_sim_OSC_url=${2:-localhost:8085}
a1_sim_STD_url=${3:-localhost:8085}
a1_sim_STD_v2_url=${4:-localhost:8085}
a1_sim_OSC_url=${2:-localhost:8085}
a1_sim_STD_url=${3:-localhost:8085}
a1_sim_STD_v2_url=${4:-localhost:8085}
-policy_agent_url=${5:-localhost:9080}
+policy_agent_url=${5:-localhost:8081}
a1_controller_url=${6:false}
echo -e "NONRTRIC HealthCheck\n"
a1_controller_url=${6:false}
echo -e "NONRTRIC HealthCheck\n"
# check PMS status
echo "check Policy Agent status:"
# check PMS status
echo "check Policy Agent status:"
-checkStatus "curl -vskw %{http_code} http://$policy_agent_url/status" "hunky dory200" "PMS"
+checkStatus "curl -vskw %{http_code} http://$policy_agent_url/status" "success200" "PMS"
# check ECS status
echo "check Enrichment service status:"
# check ECS status
echo "check Enrichment service status:"
a1_sim_OSC_url=${2:-localhost:8085}
a1_sim_STD_url=${3:-localhost:8085}
a1_sim_STD_v2_url=${4:-localhost:8085}
a1_sim_OSC_url=${2:-localhost:8085}
a1_sim_STD_url=${3:-localhost:8085}
a1_sim_STD_v2_url=${4:-localhost:8085}
-policy_agent_url=${5:-localhost:9081}
+policy_agent_url=${5:-localhost:8081}
httpx=${6:-"http"}
echo "using dmaap-mr url: "$dmaap_mr_url
httpx=${6:-"http"}
echo "using dmaap-mr url: "$dmaap_mr_url
a1_sim_OSC_url=${1:-localhost:8085}
a1_sim_STD_v2_url=${2:-localhost:8085}
a1_sim_OSC_url=${1:-localhost:8085}
a1_sim_STD_v2_url=${2:-localhost:8085}
-policy_agent_url=${3:-localhost:9081}
+policy_agent_url=${3:-localhost:8081}
httpx=${4:-"http"}
SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
httpx=${4:-"http"}
SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
curlString="curl -skw %{http_code} $httpx://$policy_agent_url/status"
res=$($curlString)
echo "$res"
curlString="curl -skw %{http_code} $httpx://$policy_agent_url/status"
res=$($curlString)
echo "$res"