summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/cli/templates/all-service.yaml10
-rw-r--r--kubernetes/cli/templates/cli-deployment.yaml3
-rwxr-xr-xkubernetes/oneclick/createAll.bash2
3 files changed, 10 insertions, 5 deletions
diff --git a/kubernetes/cli/templates/all-service.yaml b/kubernetes/cli/templates/all-service.yaml
index e848bfdc38..24e19792e1 100644
--- a/kubernetes/cli/templates/all-service.yaml
+++ b/kubernetes/cli/templates/all-service.yaml
@@ -8,11 +8,15 @@ metadata:
app: cli
spec:
ports:
- - name: 80-port
- port: 80
+ - name: 8080-port
+ port: 8080
targetPort: 80
nodePort: {{ .Values.nodePortPrefix }}60
+ - name: 9090-port
+ port: 9090
+ targetPort: 8080
+ nodePort: {{ .Values.nodePortPrefix }}61
type: NodePort
selector:
app: cli
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/cli/templates/cli-deployment.yaml b/kubernetes/cli/templates/cli-deployment.yaml
index 3a702b9016..128c28a7f1 100644
--- a/kubernetes/cli/templates/cli-deployment.yaml
+++ b/kubernetes/cli/templates/cli-deployment.yaml
@@ -25,6 +25,7 @@ spec:
value: daemon
ports:
- containerPort: 80
+ - containerPort: 8080
name: cli
readinessProbe:
tcpSocket:
@@ -33,4 +34,4 @@ spec:
periodSeconds: 10
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 0a656ee22e..0240c83e1a 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -87,7 +87,7 @@ create_onap_helm() {
# assign default auth token
if [[ -z $ONAP_DEFAULT_AUTH_TOKEN ]]; then
DEFAULT_SECRET=`kubectl get secrets -n kube-system | grep default-token | awk '{ print $1}'`
- ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n kube-system -o yaml | grep 'token:' | awk '{ print $2}' | base64 -d`
+ ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n kube-system -o yaml | grep 'token:' | awk '{ print $2}' | base64 --decode`
fi
cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3,kubeMasterAuthToken=$ONAP_DEFAULT_AUTH_TOKEN ${HELM_VALUES_ADDITION}`