Merge "Reset workflow-designer to frankfurt"
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>
Tue, 7 Jul 2020 13:41:49 +0000 (13:41 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 7 Jul 2020 13:41:49 +0000 (13:41 +0000)
16 files changed:
INFO.yaml
kubernetes/aaf/components/aaf-cert-service/templates/deployment.yaml
kubernetes/aaf/components/aaf-cert-service/values.yaml
kubernetes/clamp/charts/clamp-backend/values.yaml
kubernetes/clamp/values.yaml
kubernetes/common/common/templates/_ingress.tpl
kubernetes/common/mariadb-init/resources/config/db_init.sh
kubernetes/common/serviceAccount/Chart.yaml [new file with mode: 0644]
kubernetes/common/serviceAccount/requirements.yaml [new file with mode: 0644]
kubernetes/common/serviceAccount/templates/role-binding.yaml [new file with mode: 0644]
kubernetes/common/serviceAccount/templates/role.yaml [new file with mode: 0644]
kubernetes/common/serviceAccount/templates/service-account.yaml [new file with mode: 0644]
kubernetes/common/serviceAccount/values.yaml [new file with mode: 0644]
kubernetes/onap/values.yaml
kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks
kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml

index b440169..553527b 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: '2017-06-15'
 lifecycle_state: 'Incubation'
 project_category: ''
 project_lead: &onap_releng_ptl
-    name: 'Mike Elliott'
-    email: 'mike.elliott@amdocs.com'
-    id: 'melliott'
-    company: 'Amdocs'
-    timezone: 'Canada/Ontario'
+    name: 'Sylvain Desbureaux'
+    email: 'sylvain.desbureaux@orange.com'
+    id: 'sdesbure'
+    company: 'Orange'
+    timezone: 'Paris/France'
 primary_contact: *onap_releng_ptl
 issue_tracking:
     type: 'jira'
@@ -31,51 +31,16 @@ repositories:
     - 'oom'
 committers:
     - <<: *onap_releng_ptl
-    - name: 'Alexis de Talhouët'
-      email: 'adetalhouet89@gmail.com'
-      company: 'Bell Canada'
-      id: 'adetalhouet'
-      timezone: 'Canada/Montreal'
+    - name: 'Mike Elliott'
+      email: 'mike.elliott@amdocs.com'
+      id: 'melliott'
+      company: 'Amdocs'
+      timezone: 'Canada/Ontario'
     - name: 'Borislav Glozman'
       email: 'Borislav.Glozman@amdocs.com'
       company: 'Amdocs'
       id: 'BorislavG'
       timezone: 'Israel/Raanana'
-    - name: 'James MacNider'
-      email: 'James.MacNider@amdocs.com'
-      company: 'Amdocs'
-      id: 'jmac'
-      timezone: 'Canada/Ontario'
-    - name: 'Hong Guan'
-      email: 'hg4105@att.com'
-      company: 'ATT'
-      id: 'hg4105'
-      timezone: 'Not/Defined'
-    - name: 'Jun (Nicolas) Hu'
-      email: 'jh245g@att.com'
-      company: 'ATT'
-      id: 'jh245g'
-      timezone: 'America/New_York'
-    - name: 'Xue Gao'
-      email: 'xg353y@intl.att.com'
-      company: 'ATT'
-      id: 'xuegao'
-      timezone: 'Belgium/Namur'
-    - name: 'Brian Freeman'
-      email: 'bf1936@att.com'
-      company: 'ATT'
-      id: 'bdfreeman1421'
-      timezone: 'America/New_York'
-    - name: 'Yang Xu'
-      email: 'Yang.Xu3@huawei.com'
-      company: 'Huawei'
-      id: 'xuyang11'
-      timezone: 'America/New_York'
-    - name: 'Sylvain Desbureaux'
-      email: 'sylvain.desbureaux@orange.com'
-      company: 'Orange'
-      id: 'sdesbure'
-      timezone: 'Paris/France'
     - name: 'Krzysztof Opasiak'
       email: 'k.opasiak@samsung.com'
       company: 'Samsung'
index 76e610f..a440664 100644 (file)
@@ -78,7 +78,7 @@ spec:
 {{- end }}
       containers:
         - name: {{ include "common.name" . }}
-          image: {{ .Values.repository }}/{{ .Values.image }}
+          image: {{ include "common.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports: {{ include "common.containerPorts" . | nindent 10 }}
           env:
index 17b0b75..ad4b7c4 100644 (file)
@@ -47,7 +47,7 @@ service:
 
 # Deployment configuration
 repository: nexus3.onap.org:10001
-image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.0.0
+image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.1.0
 pullPolicy: Always
 replicaCount: 1
 
index f354ad1..3e08bd6 100644 (file)
@@ -35,7 +35,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp-backend:5.0.6
+image: onap/clamp-backend:5.0.7
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 9446ca8..2a27c14 100644 (file)
@@ -58,7 +58,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp-frontend:5.0.6
+image: onap/clamp-frontend:5.0.7
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index c3c7443..6b4f0ed 100644 (file)
@@ -78,7 +78,7 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false"
   {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" (default (dict) .Values.global.ingress) "var" "enabled") }}
   {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" .Values.ingress "var" "enabledOverride") }}
   {{- if $ingressEnabled }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ include "common.fullname" . }}-ingress
index b2fdb14..40254d4 100755 (executable)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# make sure the script fails if any of commands failed
+set -e
+
 while read DB ; do
     USER_VAR="MYSQL_USER_${DB^^}"
     PASS_VAR="MYSQL_PASSWORD_${DB^^}"
     USER=${!USER_VAR}
-    PASS=${!PASS_VAR}
+    PASS=`echo -n ${!PASS_VAR} | sed -e "s/'/''/g"`
     MYSQL_OPTS=( -h ${DB_HOST} -P ${DB_PORT} -uroot -p${MYSQL_ROOT_PASSWORD} )
 
     echo "Creating database ${DB} and user ${USER}..."
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
new file mode 100644 (file)
index 0000000..9e838af
--- /dev/null
@@ -0,0 +1,18 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+description: Template used to create the right Service Accounts / Role / RoleBinding
+name: serviceAccount
+version: 6.0.0
diff --git a/kubernetes/common/serviceAccount/requirements.yaml b/kubernetes/common/serviceAccount/requirements.yaml
new file mode 100644 (file)
index 0000000..237f1d1
--- /dev/null
@@ -0,0 +1,18 @@
+# Copyright © 2018 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: 'file://../common'
diff --git a/kubernetes/common/serviceAccount/templates/role-binding.yaml b/kubernetes/common/serviceAccount/templates/role-binding.yaml
new file mode 100644 (file)
index 0000000..2082f84
--- /dev/null
@@ -0,0 +1,33 @@
+{{/*
+# Copyright © 2020 Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{- $dot := . -}}
+{{- range $role_type := $dot.Values.roles }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+# This cluster role binding allows anyone in the "manager" group to read secrets in any namespace.
+kind: RoleBinding
+metadata:
+  name: {{ include "common.fullname" (dict "suffix" $role_type "dot" $dot )}}
+  namespace: {{ include "common.namespace" $dot }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "common.fullname" (dict "suffix" $role_type "dot" $dot )}}
+roleRef:
+  kind: Role
+  name: {{ include "common.fullname" (dict "suffix" $role_type "dot" $dot )}}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
diff --git a/kubernetes/common/serviceAccount/templates/role.yaml b/kubernetes/common/serviceAccount/templates/role.yaml
new file mode 100644 (file)
index 0000000..73f45b5
--- /dev/null
@@ -0,0 +1,105 @@
+{{/*
+# Copyright © 2020 Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{-   $dot := . -}}
+{{- range $role_type := $dot.Values.roles }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "common.fullname" (dict "suffix" $role_type "dot" $dot )}}
+  namespace: {{ include "common.namespace" $dot }}
+rules:
+{{- if eq $role_type "read" }}
+- apiGroups:
+  - "" # "" indicates the core API group
+  - apps
+  - batch
+  resources:
+  - pods
+  - deployments
+  - jobs
+  - jobs/status
+  - statefulsets
+  - replicasets
+  - daemonsets
+  verbs:
+  - get
+  - watch
+  - list
+{{- else  }}
+{{-   if eq $role_type "create" }}
+- apiGroups:
+  - "" # "" indicates the core API group
+  - apps
+  - batch
+  resources:
+  - pods
+  - deployments
+  - jobs
+  - jobs/status
+  - statefulsets
+  - replicasets
+  - daemonsets
+  - secrets
+  verbs:
+  - get
+  - watch
+  - list
+- apiGroups:
+  - "" # "" indicates the core API group
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - patch
+- apiGroups:
+  - "" # "" indicates the core API group
+  - apps
+  resources:
+  - deployments
+  - secrets
+  verbs:
+  - create
+- apiGroups:
+  - "" # "" indicates the core API group
+  - apps
+  resources:
+  - pods
+  - persistentvolumeclaims
+  - secrets
+  - deployment
+  verbs:
+  - delete
+- apiGroups:
+  - "" # "" indicates the core API group
+  - apps
+  resources:
+  - pods/exec
+  verbs:
+  - create
+{{-   else }}
+{{-     if hasKey $dot.Values.new_roles_definitions $role_type  }}
+{{ include "common.tplValue" ( dict "value" (index $dot.Values.new_roles_definitions $role_type ) "context" $dot) }}
+{{-     else}}
+# if you don't match read or create, then you're not allowed to use API
+- apiGroups: []
+  resources: []
+  verbs: []
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- end }}
diff --git a/kubernetes/common/serviceAccount/templates/service-account.yaml b/kubernetes/common/serviceAccount/templates/service-account.yaml
new file mode 100644 (file)
index 0000000..449bea6
--- /dev/null
@@ -0,0 +1,24 @@
+{{/*
+# Copyright © 2020 Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{-   $dot := . -}}
+{{- range $role_type := $dot.Values.roles }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "common.fullname" (dict "suffix" $role_type "dot" $dot )}}
+{{- end }}
diff --git a/kubernetes/common/serviceAccount/values.yaml b/kubernetes/common/serviceAccount/values.yaml
new file mode 100644 (file)
index 0000000..afa8194
--- /dev/null
@@ -0,0 +1,29 @@
+# Copyright © 2020 Samsung Electronics
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+roles:
+  - nothing
+# - read
+# - create
+
+new_roles_definitions: {}
+#  few-read:
+#    - apiGroups:
+#        -  ""
+#      resources:
+#        - "pods"
+#      verbs:
+#        - "get"
+#        - "watch"
+#        - "list"
index e48e3c6..8a94369 100755 (executable)
@@ -113,7 +113,7 @@ global:
   cmpv2Enabled: true
   aaf:
     certServiceClient:
-      image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.0.0
+      image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.1.0
       secret:
         name: aaf-cert-service-client-tls-secret
         mountPath: /etc/onap/aaf/certservice/certs/
@@ -127,6 +127,7 @@ global:
         # Client configuration related
         caName: "RA"
         requestURL: "https://aaf-cert-service:8443/v1/certificate/"
+        outputType: "P12"
         requestTimeout: "20000"
         keystorePath: "/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks"
         keystorePassword: "secret"
index 9ebe9a8..31ea6ba 100644 (file)
Binary files a/kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks and b/kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks differ
index 1166eab..4128bc3 100755 (executable)
@@ -55,11 +55,11 @@ etsi-catalog-manager:
   vnfpkgm:
   {{- if .Values.global.msbEnabled }}
     endpoint: https://msb-iag:443/api/vnfpkgm/v1
-    http:
-      client:
-        ssl:
-          trust-store: ${TRUSTSTORE}
-          trust-store-password: ${TRUSTSTORE_PASSWORD}
+  http:
+    client:
+      ssl:
+        trust-store: ${TRUSTSTORE}
+        trust-store-password: ${TRUSTSTORE_PASSWORD}
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
   {{- end }}