aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release_notes/release-notes.rst2
-rwxr-xr-xkubernetes/helm/plugins/deploy/deploy.sh26
-rw-r--r--kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/service.yaml10
-rw-r--r--kubernetes/sdc/components/sdc-fe/templates/service.yaml20
-rw-r--r--kubernetes/sdc/components/sdc-fe/values.yaml3
-rw-r--r--kubernetes/sdnc/components/dmaap-listener/values.yaml2
-rw-r--r--kubernetes/sdnc/components/sdnc-ansible-server/values.yaml2
-rw-r--r--kubernetes/sdnc/components/sdnc-web/values.yaml2
-rw-r--r--kubernetes/sdnc/components/ueb-listener/values.yaml2
-rw-r--r--kubernetes/sdnc/values.yaml2
10 files changed, 32 insertions, 39 deletions
diff --git a/docs/release_notes/release-notes.rst b/docs/release_notes/release-notes.rst
index a88318171c..1ab2173e10 100644
--- a/docs/release_notes/release-notes.rst
+++ b/docs/release_notes/release-notes.rst
@@ -55,7 +55,7 @@ New features
**Bug fixes**
A list of issues resolved in this release can be found here:
-
+https://jira.onap.org/projects/OOM/versions/11498
**Known Issues**
diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index a8d134ba92..347c7689e4 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -70,21 +70,21 @@ generate_overrides() {
resolve_deploy_flags() {
- flags=($1)
- n=${#flags[*]}
- i=0 ; while [ "$i" -lt "$n" ]; do
- PARAM=${flags[i]}
- if [ "$PARAM" = "-f" ] || \
- [ "$PARAM" = "--values" ] || \
- [ "$PARAM" = "--set" ] || \
- [ "$PARAM" = "--set-string" ] || \
- [ "$PARAM" = "--version" ]; then
- # skip param and its value
- i=$((i + 1))
+ skip="false"
+ for param in $1; do
+ if [ "$skip" = "false" ]; then
+ if [ "$param" = "-f" ] || \
+ [ "$param" = "--values" ] || \
+ [ "$param" = "--set" ] || \
+ [ "$param" = "--set-string" ] || \
+ [ "$param" = "--version" ]; then
+ skip="true"
+ else
+ DEPLOY_FLAGS="$DEPLOY_FLAGS $param"
+ fi
else
- DEPLOY_FLAGS="$DEPLOY_FLAGS $PARAM"
+ skip="false"
fi
- i=$((i+1))
done
echo "$DEPLOY_FLAGS"
}
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/service.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/service.yaml
index 73381c9e3b..2439223192 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/service.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/service.yaml
@@ -18,16 +18,10 @@
# ============LICENSE_END=========================================================
*/}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: policy-clamp-cl-k8s-ppnt
- namespace: {{ include "common.namespace" . }}
----
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
- name: {{ include "common.namespace" . }}-policy-clamp-cl-k8s-ppnt-binding
+ name: {{ include "common.namespace" . }}-policy-clamp-ac-k8s-ppnt-binding
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,6 +34,6 @@ roleRef:
name: cluster-admin
subjects:
- kind: ServiceAccount
- name: policy-clamp-cl-k8s-ppnt
+ name: {{ include "common.fullname" (dict "suffix" "create" "dot" . )}}
namespace: {{ include "common.namespace" . }}
diff --git a/kubernetes/sdc/components/sdc-fe/templates/service.yaml b/kubernetes/sdc/components/sdc-fe/templates/service.yaml
index 968a09c77e..30c3d1122f 100644
--- a/kubernetes/sdc/components/sdc-fe/templates/service.yaml
+++ b/kubernetes/sdc/components/sdc-fe/templates/service.yaml
@@ -39,17 +39,15 @@ metadata:
spec:
type: {{ .Values.service.type }}
ports:
- - port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
- targetPort: {{ .Values.service.internalPort }}
- {{ if (include "common.needTLS" .) }}
- - port: {{ .Values.service.internalPort2 }}
- targetPort: {{ .Values.service.internalPort2 }}
- name: {{ .Values.service.portName }}s
- {{ if eq .Values.service.type "NodePort" -}}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
- {{ end }}
- {{ end }}
+ {{if eq .Values.service.type "NodePort" -}}
+ - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
+ {{- else -}}
+ - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.externalPort2 .Values.service.externalPort }}
+ targetPort: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }}
+ name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
+ {{- end}}
selector:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 6267da90f3..e86ae4c0d2 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -114,9 +114,10 @@ service:
portName: http
internalPort: 8181
externalPort: 8181
- nodePort2: "07"
internalPort2: 9443
externalPort2: 9443
+ nodePort: "07"
+
ingress:
enabled: false
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 7ef646f3e1..3d9fc6aab3 100644
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -49,7 +49,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-dmaap-listener-image:2.3.0
+image: onap/sdnc-dmaap-listener-image:2.3.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index 768a617b63..1db0ed7be7 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -49,7 +49,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-ansible-server-image:2.3.0
+image: onap/sdnc-ansible-server-image:2.3.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index f75b56726c..997d0a2c84 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -23,7 +23,7 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: "onap/sdnc-web-image:2.2.5"
+image: "onap/sdnc-web-image:2.3.1"
pullPolicy: Always
config:
diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 50fee59a32..c74f6522d9 100644
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -55,7 +55,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-ueb-listener-image:2.3.0
+image: onap/sdnc-ueb-listener-image:2.3.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index d45e13eb01..b4c0dd5f26 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -210,7 +210,7 @@ certificates:
# application images
pullPolicy: Always
-image: onap/sdnc-image:2.3.0
+image: onap/sdnc-image:2.3.1
# flag to enable debugging - application support required
debugEnabled: false