Merge "[AAI] Release 14.0.1 chart with Janusgraph update to 0.6.0"
diff --git a/kubernetes/cli/.helmignore b/archive/cli/.helmignore
similarity index 100%
rename from kubernetes/cli/.helmignore
rename to archive/cli/.helmignore
diff --git a/kubernetes/cli/Chart.yaml b/archive/cli/Chart.yaml
similarity index 100%
rename from kubernetes/cli/Chart.yaml
rename to archive/cli/Chart.yaml
diff --git a/kubernetes/cli/resources/configuration/lighttpd.conf b/archive/cli/resources/configuration/lighttpd.conf
similarity index 100%
rename from kubernetes/cli/resources/configuration/lighttpd.conf
rename to archive/cli/resources/configuration/lighttpd.conf
diff --git a/kubernetes/cli/templates/configmap.yaml b/archive/cli/templates/configmap.yaml
similarity index 100%
rename from kubernetes/cli/templates/configmap.yaml
rename to archive/cli/templates/configmap.yaml
diff --git a/kubernetes/cli/templates/deployment.yaml b/archive/cli/templates/deployment.yaml
similarity index 100%
rename from kubernetes/cli/templates/deployment.yaml
rename to archive/cli/templates/deployment.yaml
diff --git a/kubernetes/cli/templates/ingress.yaml b/archive/cli/templates/ingress.yaml
similarity index 100%
rename from kubernetes/cli/templates/ingress.yaml
rename to archive/cli/templates/ingress.yaml
diff --git a/kubernetes/cli/templates/service.yaml b/archive/cli/templates/service.yaml
similarity index 100%
rename from kubernetes/cli/templates/service.yaml
rename to archive/cli/templates/service.yaml
diff --git a/kubernetes/cli/values.yaml b/archive/cli/values.yaml
similarity index 100%
rename from kubernetes/cli/values.yaml
rename to archive/cli/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/archive/dcaegen2-services/components/dcae-pmsh/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/service.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml b/archive/dcaegen2-services/components/dcae-pmsh/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/archive/dcaegen2-services/components/dcae-son-handler/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/service.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/archive/dcaegen2-services/components/dcae-son-handler/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/values.yaml
diff --git a/kubernetes/dmaap/.helmignore b/archive/dmaap/.helmignore
similarity index 100%
rename from kubernetes/dmaap/.helmignore
rename to archive/dmaap/.helmignore
diff --git a/kubernetes/dmaap/Chart.yaml b/archive/dmaap/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/Chart.yaml
rename to archive/dmaap/Chart.yaml
diff --git a/kubernetes/dmaap/Makefile b/archive/dmaap/Makefile
similarity index 100%
rename from kubernetes/dmaap/Makefile
rename to archive/dmaap/Makefile
diff --git a/kubernetes/dmaap/README.md b/archive/dmaap/README.md
similarity index 100%
rename from kubernetes/dmaap/README.md
rename to archive/dmaap/README.md
diff --git a/kubernetes/dmaap/components/Makefile b/archive/dmaap/components/Makefile
similarity index 100%
rename from kubernetes/dmaap/components/Makefile
rename to archive/dmaap/components/Makefile
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/.helmignore b/archive/dmaap/components/dmaap-dr-node/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/.helmignore
rename to archive/dmaap/components/dmaap-dr-node/.helmignore
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/archive/dmaap/components/dmaap-dr-node/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
rename to archive/dmaap/components/dmaap-dr-node/Chart.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/logback.xml b/archive/dmaap/components/dmaap-dr-node/resources/config/logback.xml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/resources/config/logback.xml
rename to archive/dmaap/components/dmaap-dr-node/resources/config/logback.xml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties b/archive/dmaap/components/dmaap-dr-node/resources/config/node.properties
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
rename to archive/dmaap/components/dmaap-dr-node/resources/config/node.properties
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml b/archive/dmaap/components/dmaap-dr-node/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/ingress.yaml b/archive/dmaap/components/dmaap-dr-node/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/ingress.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/ingress.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/pv-event.yaml b/archive/dmaap/components/dmaap-dr-node/templates/pv-event.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/pv-event.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/pv-event.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml b/archive/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml b/archive/dmaap/components/dmaap-dr-node/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/service.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/archive/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/archive/dmaap/components/dmaap-dr-node/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/values.yaml
rename to archive/dmaap/components/dmaap-dr-node/values.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/.helmignore b/archive/dmaap/components/dmaap-dr-prov/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/.helmignore
rename to archive/dmaap/components/dmaap-dr-prov/.helmignore
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/archive/dmaap/components/dmaap-dr-prov/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
rename to archive/dmaap/components/dmaap-dr-prov/Chart.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/logback.xml b/archive/dmaap/components/dmaap-dr-prov/resources/config/logback.xml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/resources/config/logback.xml
rename to archive/dmaap/components/dmaap-dr-prov/resources/config/logback.xml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/archive/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
rename to archive/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/configmap.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/configmap.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/ingress.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/ingress.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/ingress.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/secret.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/secret.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/secret.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/secret.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/service.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/archive/dmaap/components/dmaap-dr-prov/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
rename to archive/dmaap/components/dmaap-dr-prov/values.yaml
diff --git a/kubernetes/dmaap/components/message-router/.helmignore b/archive/dmaap/components/message-router/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/message-router/.helmignore
rename to archive/dmaap/components/message-router/.helmignore
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/archive/dmaap/components/message-router/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/Chart.yaml
rename to archive/dmaap/components/message-router/Chart.yaml
diff --git a/kubernetes/dmaap/components/message-router/Makefile b/archive/dmaap/components/message-router/Makefile
similarity index 100%
rename from kubernetes/dmaap/components/message-router/Makefile
rename to archive/dmaap/components/message-router/Makefile
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties b/archive/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
similarity index 100%
rename from kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
rename to archive/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml b/archive/dmaap/components/message-router/resources/config/dmaap/logback.xml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
rename to archive/dmaap/components/message-router/resources/config/dmaap/logback.xml
diff --git a/kubernetes/dmaap/components/message-router/templates/configmap.yaml b/archive/dmaap/components/message-router/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/configmap.yaml
rename to archive/dmaap/components/message-router/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/message-router/templates/ingress.yaml b/archive/dmaap/components/message-router/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/ingress.yaml
rename to archive/dmaap/components/message-router/templates/ingress.yaml
diff --git a/kubernetes/dmaap/components/message-router/templates/service.yaml b/archive/dmaap/components/message-router/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/service.yaml
rename to archive/dmaap/components/message-router/templates/service.yaml
diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/archive/dmaap/components/message-router/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/statefulset.yaml
rename to archive/dmaap/components/message-router/templates/statefulset.yaml
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/archive/dmaap/components/message-router/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/values.yaml
rename to archive/dmaap/components/message-router/values.yaml
diff --git a/kubernetes/dmaap/values.yaml b/archive/dmaap/values.yaml
similarity index 100%
rename from kubernetes/dmaap/values.yaml
rename to archive/dmaap/values.yaml
diff --git a/kubernetes/holmes/.helmignore b/archive/holmes/.helmignore
similarity index 100%
rename from kubernetes/holmes/.helmignore
rename to archive/holmes/.helmignore
diff --git a/kubernetes/holmes/Chart.yaml b/archive/holmes/Chart.yaml
similarity index 100%
rename from kubernetes/holmes/Chart.yaml
rename to archive/holmes/Chart.yaml
diff --git a/kubernetes/holmes/Makefile b/archive/holmes/Makefile
similarity index 100%
rename from kubernetes/holmes/Makefile
rename to archive/holmes/Makefile
diff --git a/kubernetes/holmes/components/Makefile b/archive/holmes/components/Makefile
similarity index 100%
rename from kubernetes/holmes/components/Makefile
rename to archive/holmes/components/Makefile
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/.helmignore b/archive/holmes/components/holmes-engine-mgmt/.helmignore
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/.helmignore
rename to archive/holmes/components/holmes-engine-mgmt/.helmignore
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml b/archive/holmes/components/holmes-engine-mgmt/Chart.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
rename to archive/holmes/components/holmes-engine-mgmt/Chart.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml b/archive/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/cfy.json b/archive/holmes/components/holmes-engine-mgmt/resources/config/cfy.json
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/cfy.json
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/cfy.json
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml b/archive/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql b/archive/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/configmap.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/configmap.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/configmap.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/configmap.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/secret.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/secret.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/secret.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/secret.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/service.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/service.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/service.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/service.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/archive/holmes/components/holmes-engine-mgmt/values.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
rename to archive/holmes/components/holmes-engine-mgmt/values.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/.helmignore b/archive/holmes/components/holmes-rule-mgmt/.helmignore
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/.helmignore
rename to archive/holmes/components/holmes-rule-mgmt/.helmignore
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml b/archive/holmes/components/holmes-rule-mgmt/Chart.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
rename to archive/holmes/components/holmes-rule-mgmt/Chart.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml b/archive/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
rename to archive/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql b/archive/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql
rename to archive/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml b/archive/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml
rename to archive/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl b/archive/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
rename to archive/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/index.json b/archive/holmes/components/holmes-rule-mgmt/resources/rules/index.json
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/index.json
rename to archive/holmes/components/holmes-rule-mgmt/resources/rules/index.json
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/configmap.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/configmap.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/configmap.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/configmap.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/ingress.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/ingress.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/ingress.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/ingress.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/secret.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/secret.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/secret.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/secret.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/service.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/service.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/service.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/service.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/archive/holmes/components/holmes-rule-mgmt/values.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
rename to archive/holmes/components/holmes-rule-mgmt/values.yaml
diff --git a/kubernetes/holmes/templates/secrets.yaml b/archive/holmes/templates/secrets.yaml
similarity index 100%
rename from kubernetes/holmes/templates/secrets.yaml
rename to archive/holmes/templates/secrets.yaml
diff --git a/kubernetes/holmes/values.yaml b/archive/holmes/values.yaml
similarity index 100%
rename from kubernetes/holmes/values.yaml
rename to archive/holmes/values.yaml
diff --git a/kubernetes/modeling/.helmignore b/archive/modeling/.helmignore
similarity index 100%
rename from kubernetes/modeling/.helmignore
rename to archive/modeling/.helmignore
diff --git a/kubernetes/modeling/Chart.yaml b/archive/modeling/Chart.yaml
similarity index 100%
rename from kubernetes/modeling/Chart.yaml
rename to archive/modeling/Chart.yaml
diff --git a/kubernetes/modeling/Makefile b/archive/modeling/Makefile
similarity index 100%
rename from kubernetes/modeling/Makefile
rename to archive/modeling/Makefile
diff --git a/kubernetes/modeling/components/Makefile b/archive/modeling/components/Makefile
similarity index 100%
rename from kubernetes/modeling/components/Makefile
rename to archive/modeling/components/Makefile
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/.helmignore b/archive/modeling/components/modeling-etsicatalog/.helmignore
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/.helmignore
rename to archive/modeling/components/modeling-etsicatalog/.helmignore
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/archive/modeling/components/modeling-etsicatalog/Chart.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
rename to archive/modeling/components/modeling-etsicatalog/Chart.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml b/archive/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
rename to archive/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml b/archive/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
rename to archive/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml b/archive/modeling/components/modeling-etsicatalog/templates/configmap.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/configmap.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/archive/modeling/components/modeling-etsicatalog/templates/deployment.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/deployment.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/pv.yaml b/archive/modeling/components/modeling-etsicatalog/templates/pv.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/pv.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/pv.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/pvc.yaml b/archive/modeling/components/modeling-etsicatalog/templates/pvc.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/pvc.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/pvc.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/secrets.yaml b/archive/modeling/components/modeling-etsicatalog/templates/secrets.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/secrets.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/secrets.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml b/archive/modeling/components/modeling-etsicatalog/templates/service.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/service.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/archive/modeling/components/modeling-etsicatalog/values.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/values.yaml
rename to archive/modeling/components/modeling-etsicatalog/values.yaml
diff --git a/kubernetes/modeling/values.yaml b/archive/modeling/values.yaml
similarity index 100%
rename from kubernetes/modeling/values.yaml
rename to archive/modeling/values.yaml
diff --git a/kubernetes/msb/.helmignore b/archive/msb/.helmignore
similarity index 100%
rename from kubernetes/msb/.helmignore
rename to archive/msb/.helmignore
diff --git a/kubernetes/msb/Chart.yaml b/archive/msb/Chart.yaml
similarity index 100%
rename from kubernetes/msb/Chart.yaml
rename to archive/msb/Chart.yaml
diff --git a/kubernetes/msb/Makefile b/archive/msb/Makefile
similarity index 100%
rename from kubernetes/msb/Makefile
rename to archive/msb/Makefile
diff --git a/kubernetes/msb/components/Makefile b/archive/msb/components/Makefile
similarity index 100%
rename from kubernetes/msb/components/Makefile
rename to archive/msb/components/Makefile
diff --git a/kubernetes/msb/components/kube2msb/.helmignore b/archive/msb/components/kube2msb/.helmignore
similarity index 100%
rename from kubernetes/msb/components/kube2msb/.helmignore
rename to archive/msb/components/kube2msb/.helmignore
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/archive/msb/components/kube2msb/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/kube2msb/Chart.yaml
rename to archive/msb/components/kube2msb/Chart.yaml
diff --git a/kubernetes/msb/components/kube2msb/templates/deployment.yaml b/archive/msb/components/kube2msb/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/kube2msb/templates/deployment.yaml
rename to archive/msb/components/kube2msb/templates/deployment.yaml
diff --git a/kubernetes/msb/components/kube2msb/values.yaml b/archive/msb/components/kube2msb/values.yaml
similarity index 100%
rename from kubernetes/msb/components/kube2msb/values.yaml
rename to archive/msb/components/kube2msb/values.yaml
diff --git a/kubernetes/msb/components/msb-consul/.helmignore b/archive/msb/components/msb-consul/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-consul/.helmignore
rename to archive/msb/components/msb-consul/.helmignore
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/archive/msb/components/msb-consul/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/Chart.yaml
rename to archive/msb/components/msb-consul/Chart.yaml
diff --git a/kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh b/archive/msb/components/msb-consul/resources/docker-entrypoint.sh
similarity index 100%
rename from kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh
rename to archive/msb/components/msb-consul/resources/docker-entrypoint.sh
diff --git a/kubernetes/msb/components/msb-consul/templates/NOTES.txt b/archive/msb/components/msb-consul/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/NOTES.txt
rename to archive/msb/components/msb-consul/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-consul/templates/configmap.yaml b/archive/msb/components/msb-consul/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/configmap.yaml
rename to archive/msb/components/msb-consul/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-consul/templates/deployment.yaml b/archive/msb/components/msb-consul/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/deployment.yaml
rename to archive/msb/components/msb-consul/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-consul/templates/ingress.yaml b/archive/msb/components/msb-consul/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/ingress.yaml
rename to archive/msb/components/msb-consul/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-consul/templates/service.yaml b/archive/msb/components/msb-consul/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/service.yaml
rename to archive/msb/components/msb-consul/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-consul/values.yaml b/archive/msb/components/msb-consul/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/values.yaml
rename to archive/msb/components/msb-consul/values.yaml
diff --git a/kubernetes/msb/components/msb-discovery/.helmignore b/archive/msb/components/msb-discovery/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/.helmignore
rename to archive/msb/components/msb-discovery/.helmignore
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/archive/msb/components/msb-discovery/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/Chart.yaml
rename to archive/msb/components/msb-discovery/Chart.yaml
diff --git a/kubernetes/msb/components/msb-discovery/resources/config/logback.xml b/archive/msb/components/msb-discovery/resources/config/logback.xml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/resources/config/logback.xml
rename to archive/msb/components/msb-discovery/resources/config/logback.xml
diff --git a/kubernetes/msb/components/msb-discovery/templates/NOTES.txt b/archive/msb/components/msb-discovery/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/NOTES.txt
rename to archive/msb/components/msb-discovery/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-discovery/templates/configmap.yaml b/archive/msb/components/msb-discovery/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/configmap.yaml
rename to archive/msb/components/msb-discovery/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml b/archive/msb/components/msb-discovery/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/deployment.yaml
rename to archive/msb/components/msb-discovery/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-discovery/templates/ingress.yaml b/archive/msb/components/msb-discovery/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/ingress.yaml
rename to archive/msb/components/msb-discovery/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-discovery/templates/service.yaml b/archive/msb/components/msb-discovery/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/service.yaml
rename to archive/msb/components/msb-discovery/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/archive/msb/components/msb-discovery/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/values.yaml
rename to archive/msb/components/msb-discovery/values.yaml
diff --git a/kubernetes/msb/components/msb-eag/.helmignore b/archive/msb/components/msb-eag/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-eag/.helmignore
rename to archive/msb/components/msb-eag/.helmignore
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/archive/msb/components/msb-eag/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/Chart.yaml
rename to archive/msb/components/msb-eag/Chart.yaml
diff --git a/kubernetes/msb/components/msb-eag/resources/config/logback.xml b/archive/msb/components/msb-eag/resources/config/logback.xml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/resources/config/logback.xml
rename to archive/msb/components/msb-eag/resources/config/logback.xml
diff --git a/kubernetes/msb/components/msb-eag/templates/NOTES.txt b/archive/msb/components/msb-eag/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/NOTES.txt
rename to archive/msb/components/msb-eag/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-eag/templates/configmap.yaml b/archive/msb/components/msb-eag/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/configmap.yaml
rename to archive/msb/components/msb-eag/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-eag/templates/deployment.yaml b/archive/msb/components/msb-eag/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/deployment.yaml
rename to archive/msb/components/msb-eag/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-eag/templates/ingress.yaml b/archive/msb/components/msb-eag/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/ingress.yaml
rename to archive/msb/components/msb-eag/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-eag/templates/service.yaml b/archive/msb/components/msb-eag/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/service.yaml
rename to archive/msb/components/msb-eag/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/archive/msb/components/msb-eag/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/values.yaml
rename to archive/msb/components/msb-eag/values.yaml
diff --git a/kubernetes/msb/components/msb-iag/.helmignore b/archive/msb/components/msb-iag/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-iag/.helmignore
rename to archive/msb/components/msb-iag/.helmignore
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/archive/msb/components/msb-iag/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/Chart.yaml
rename to archive/msb/components/msb-iag/Chart.yaml
diff --git a/kubernetes/msb/components/msb-iag/resources/config/logback.xml b/archive/msb/components/msb-iag/resources/config/logback.xml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/resources/config/logback.xml
rename to archive/msb/components/msb-iag/resources/config/logback.xml
diff --git a/kubernetes/msb/components/msb-iag/templates/NOTES.txt b/archive/msb/components/msb-iag/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/NOTES.txt
rename to archive/msb/components/msb-iag/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-iag/templates/configmap.yaml b/archive/msb/components/msb-iag/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/configmap.yaml
rename to archive/msb/components/msb-iag/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-iag/templates/deployment.yaml b/archive/msb/components/msb-iag/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/deployment.yaml
rename to archive/msb/components/msb-iag/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-iag/templates/ingress.yaml b/archive/msb/components/msb-iag/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/ingress.yaml
rename to archive/msb/components/msb-iag/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-iag/templates/service.yaml b/archive/msb/components/msb-iag/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/service.yaml
rename to archive/msb/components/msb-iag/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/archive/msb/components/msb-iag/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/values.yaml
rename to archive/msb/components/msb-iag/values.yaml
diff --git a/kubernetes/msb/resources/config/log/discovery/logback.xml b/archive/msb/resources/config/log/discovery/logback.xml
similarity index 100%
rename from kubernetes/msb/resources/config/log/discovery/logback.xml
rename to archive/msb/resources/config/log/discovery/logback.xml
diff --git a/kubernetes/msb/resources/config/log/eag/logback.xml b/archive/msb/resources/config/log/eag/logback.xml
similarity index 100%
rename from kubernetes/msb/resources/config/log/eag/logback.xml
rename to archive/msb/resources/config/log/eag/logback.xml
diff --git a/kubernetes/msb/resources/config/log/filebeat/filebeat.yml b/archive/msb/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/msb/resources/config/log/filebeat/filebeat.yml
rename to archive/msb/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/msb/resources/config/log/iag/logback.xml b/archive/msb/resources/config/log/iag/logback.xml
similarity index 100%
rename from kubernetes/msb/resources/config/log/iag/logback.xml
rename to archive/msb/resources/config/log/iag/logback.xml
diff --git a/kubernetes/msb/templates/configmap.yaml b/archive/msb/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/templates/configmap.yaml
rename to archive/msb/templates/configmap.yaml
diff --git a/kubernetes/msb/templates/serviceaccount.yaml b/archive/msb/templates/serviceaccount.yaml
similarity index 100%
rename from kubernetes/msb/templates/serviceaccount.yaml
rename to archive/msb/templates/serviceaccount.yaml
diff --git a/kubernetes/msb/values.yaml b/archive/msb/values.yaml
similarity index 100%
rename from kubernetes/msb/values.yaml
rename to archive/msb/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/.helmignore b/archive/multicloud/components/multicloud-pike/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/.helmignore
rename to archive/multicloud/components/multicloud-pike/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/archive/multicloud/components/multicloud-pike/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/Chart.yaml
rename to archive/multicloud/components/multicloud-pike/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml b/archive/multicloud/components/multicloud-pike/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-pike/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt b/archive/multicloud/components/multicloud-pike/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-pike/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml b/archive/multicloud/components/multicloud-pike/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-pike/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/archive/multicloud/components/multicloud-pike/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-pike/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/ingress.yaml b/archive/multicloud/components/multicloud-pike/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-pike/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/service.yaml b/archive/multicloud/components/multicloud-pike/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/service.yaml
rename to archive/multicloud/components/multicloud-pike/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/archive/multicloud/components/multicloud-pike/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/values.yaml
rename to archive/multicloud/components/multicloud-pike/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/archive/multicloud/components/multicloud-prometheus/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
rename to archive/multicloud/components/multicloud-prometheus/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml b/archive/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
rename to archive/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml b/archive/multicloud/components/multicloud-prometheus/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml b/archive/multicloud/components/multicloud-prometheus/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml b/archive/multicloud/components/multicloud-prometheus/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml b/archive/multicloud/components/multicloud-prometheus/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml b/archive/multicloud/components/multicloud-prometheus/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml b/archive/multicloud/components/multicloud-prometheus/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/values.yaml
rename to archive/multicloud/components/multicloud-prometheus/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/.helmignore b/archive/multicloud/components/multicloud-starlingx/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/.helmignore
rename to archive/multicloud/components/multicloud-starlingx/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/archive/multicloud/components/multicloud-starlingx/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
rename to archive/multicloud/components/multicloud-starlingx/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json b/archive/multicloud/components/multicloud-starlingx/resources/config/log/config.json
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
rename to archive/multicloud/components/multicloud-starlingx/resources/config/log/config.json
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml b/archive/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt b/archive/multicloud/components/multicloud-starlingx/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-starlingx/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml b/archive/multicloud/components/multicloud-starlingx/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/archive/multicloud/components/multicloud-starlingx/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/ingress.yaml b/archive/multicloud/components/multicloud-starlingx/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml b/archive/multicloud/components/multicloud-starlingx/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/archive/multicloud/components/multicloud-starlingx/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/values.yaml
rename to archive/multicloud/components/multicloud-starlingx/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/.helmignore b/archive/multicloud/components/multicloud-vio/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/.helmignore
rename to archive/multicloud/components/multicloud-vio/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/archive/multicloud/components/multicloud-vio/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/Chart.yaml
rename to archive/multicloud/components/multicloud-vio/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml b/archive/multicloud/components/multicloud-vio/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-vio/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt b/archive/multicloud/components/multicloud-vio/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-vio/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml b/archive/multicloud/components/multicloud-vio/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-vio/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml b/archive/multicloud/components/multicloud-vio/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-vio/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/ingress.yaml b/archive/multicloud/components/multicloud-vio/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-vio/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/service.yaml b/archive/multicloud/components/multicloud-vio/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/service.yaml
rename to archive/multicloud/components/multicloud-vio/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/values.yaml b/archive/multicloud/components/multicloud-vio/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/values.yaml
rename to archive/multicloud/components/multicloud-vio/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/.helmignore b/archive/multicloud/components/multicloud-windriver/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/.helmignore
rename to archive/multicloud/components/multicloud-windriver/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/archive/multicloud/components/multicloud-windriver/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
rename to archive/multicloud/components/multicloud-windriver/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json b/archive/multicloud/components/multicloud-windriver/resources/config/log/config.json
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
rename to archive/multicloud/components/multicloud-windriver/resources/config/log/config.json
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml b/archive/multicloud/components/multicloud-windriver/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-windriver/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt b/archive/multicloud/components/multicloud-windriver/resources/config/log/test.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt
rename to archive/multicloud/components/multicloud-windriver/resources/config/log/test.txt
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt b/archive/multicloud/components/multicloud-windriver/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-windriver/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml b/archive/multicloud/components/multicloud-windriver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/archive/multicloud/components/multicloud-windriver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/ingress.yaml b/archive/multicloud/components/multicloud-windriver/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml b/archive/multicloud/components/multicloud-windriver/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml b/archive/multicloud/components/multicloud-windriver/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml b/archive/multicloud/components/multicloud-windriver/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/archive/multicloud/components/multicloud-windriver/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/values.yaml
rename to archive/multicloud/components/multicloud-windriver/values.yaml
diff --git a/kubernetes/nbi/.helmignore b/archive/nbi/.helmignore
similarity index 100%
rename from kubernetes/nbi/.helmignore
rename to archive/nbi/.helmignore
diff --git a/kubernetes/nbi/Chart.yaml b/archive/nbi/Chart.yaml
similarity index 100%
rename from kubernetes/nbi/Chart.yaml
rename to archive/nbi/Chart.yaml
diff --git a/kubernetes/nbi/README.md b/archive/nbi/README.md
similarity index 100%
rename from kubernetes/nbi/README.md
rename to archive/nbi/README.md
diff --git a/kubernetes/nbi/templates/deployment.yaml b/archive/nbi/templates/deployment.yaml
similarity index 100%
rename from kubernetes/nbi/templates/deployment.yaml
rename to archive/nbi/templates/deployment.yaml
diff --git a/kubernetes/nbi/templates/ingress.yaml b/archive/nbi/templates/ingress.yaml
similarity index 100%
rename from kubernetes/nbi/templates/ingress.yaml
rename to archive/nbi/templates/ingress.yaml
diff --git a/kubernetes/nbi/templates/secret.yaml b/archive/nbi/templates/secret.yaml
similarity index 100%
rename from kubernetes/nbi/templates/secret.yaml
rename to archive/nbi/templates/secret.yaml
diff --git a/kubernetes/nbi/templates/service.yaml b/archive/nbi/templates/service.yaml
similarity index 100%
rename from kubernetes/nbi/templates/service.yaml
rename to archive/nbi/templates/service.yaml
diff --git a/kubernetes/nbi/tests/deployment_test.yaml b/archive/nbi/tests/deployment_test.yaml
similarity index 100%
rename from kubernetes/nbi/tests/deployment_test.yaml
rename to archive/nbi/tests/deployment_test.yaml
diff --git a/kubernetes/nbi/values.yaml b/archive/nbi/values.yaml
similarity index 100%
rename from kubernetes/nbi/values.yaml
rename to archive/nbi/values.yaml
diff --git a/kubernetes/oof/.helmignore b/archive/oof/.helmignore
similarity index 100%
rename from kubernetes/oof/.helmignore
rename to archive/oof/.helmignore
diff --git a/kubernetes/oof/Chart.yaml b/archive/oof/Chart.yaml
similarity index 100%
rename from kubernetes/oof/Chart.yaml
rename to archive/oof/Chart.yaml
diff --git a/kubernetes/oof/Makefile b/archive/oof/Makefile
similarity index 100%
rename from kubernetes/oof/Makefile
rename to archive/oof/Makefile
diff --git a/kubernetes/oof/components/Makefile b/archive/oof/components/Makefile
similarity index 100%
rename from kubernetes/oof/components/Makefile
rename to archive/oof/components/Makefile
diff --git a/kubernetes/oof/components/oof-has/.helmignore b/archive/oof/components/oof-has/.helmignore
similarity index 100%
rename from kubernetes/oof/components/oof-has/.helmignore
rename to archive/oof/components/oof-has/.helmignore
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/archive/oof/components/oof-has/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/Chart.yaml
rename to archive/oof/components/oof-has/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/Makefile b/archive/oof/components/oof-has/Makefile
similarity index 100%
rename from kubernetes/oof/components/oof-has/Makefile
rename to archive/oof/components/oof-has/Makefile
diff --git a/kubernetes/oof/components/oof-has/components/Makefile b/archive/oof/components/oof-has/components/Makefile
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/Makefile
rename to archive/oof/components/oof-has/components/Makefile
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-api/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt b/archive/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt
rename to archive/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/service.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/service.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/archive/oof/components/oof-has/components/oof-has-api/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-controller/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml b/archive/oof/components/oof-has/components/oof-has-controller/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-data/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-data/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml b/archive/oof/components/oof-has/components/oof-has-data/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-solver/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml b/archive/oof/components/oof-has/components/oof-has-solver/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/values.yaml
diff --git a/kubernetes/oof/components/oof-has/resources/config/conductor.conf b/archive/oof/components/oof-has/resources/config/conductor.conf
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/conductor.conf
rename to archive/oof/components/oof-has/resources/config/conductor.conf
diff --git a/kubernetes/oof/components/oof-has/resources/config/healthy.sh b/archive/oof/components/oof-has/resources/config/healthy.sh
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/healthy.sh
rename to archive/oof/components/oof-has/resources/config/healthy.sh
diff --git a/kubernetes/oof/components/oof-has/resources/config/log.conf b/archive/oof/components/oof-has/resources/config/log.conf
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/log.conf
rename to archive/oof/components/oof-has/resources/config/log.conf
diff --git a/kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml b/archive/oof/components/oof-has/resources/config/log/filebeat.yml
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml
rename to archive/oof/components/oof-has/resources/config/log/filebeat.yml
diff --git a/kubernetes/oof/components/oof-has/resources/config/nginx.conf b/archive/oof/components/oof-has/resources/config/nginx.conf
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/nginx.conf
rename to archive/oof/components/oof-has/resources/config/nginx.conf
diff --git a/kubernetes/oof/components/oof-has/templates/configmap.yaml b/archive/oof/components/oof-has/templates/configmap.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/templates/configmap.yaml
rename to archive/oof/components/oof-has/templates/configmap.yaml
diff --git a/kubernetes/oof/components/oof-has/templates/secret.yaml b/archive/oof/components/oof-has/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/templates/secret.yaml
rename to archive/oof/components/oof-has/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/values.yaml b/archive/oof/components/oof-has/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/values.yaml
rename to archive/oof/components/oof-has/values.yaml
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/archive/oof/components/oof-templates/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-templates/Chart.yaml
rename to archive/oof/components/oof-templates/Chart.yaml
diff --git a/kubernetes/oof/components/oof-templates/templates/_secret.tpl b/archive/oof/components/oof-templates/templates/_secret.tpl
similarity index 100%
rename from kubernetes/oof/components/oof-templates/templates/_secret.tpl
rename to archive/oof/components/oof-templates/templates/_secret.tpl
diff --git a/kubernetes/oof/components/oof-templates/values.yaml b/archive/oof/components/oof-templates/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-templates/values.yaml
rename to archive/oof/components/oof-templates/values.yaml
diff --git a/kubernetes/oof/resources/config/conf/common_config.yaml b/archive/oof/resources/config/conf/common_config.yaml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/common_config.yaml
rename to archive/oof/resources/config/conf/common_config.yaml
diff --git a/kubernetes/oof/resources/config/conf/log.yml b/archive/oof/resources/config/conf/log.yml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/log.yml
rename to archive/oof/resources/config/conf/log.yml
diff --git a/kubernetes/oof/resources/config/conf/osdf_config.yaml b/archive/oof/resources/config/conf/osdf_config.yaml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/osdf_config.yaml
rename to archive/oof/resources/config/conf/osdf_config.yaml
diff --git a/kubernetes/oof/resources/config/conf/slicing_config.yaml b/archive/oof/resources/config/conf/slicing_config.yaml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/slicing_config.yaml
rename to archive/oof/resources/config/conf/slicing_config.yaml
diff --git a/kubernetes/oof/templates/NOTES.txt b/archive/oof/templates/NOTES.txt
similarity index 100%
rename from kubernetes/oof/templates/NOTES.txt
rename to archive/oof/templates/NOTES.txt
diff --git a/kubernetes/oof/templates/configmap.yaml b/archive/oof/templates/configmap.yaml
similarity index 100%
rename from kubernetes/oof/templates/configmap.yaml
rename to archive/oof/templates/configmap.yaml
diff --git a/kubernetes/oof/templates/deployment.yaml b/archive/oof/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/templates/deployment.yaml
rename to archive/oof/templates/deployment.yaml
diff --git a/kubernetes/oof/templates/ingress.yaml b/archive/oof/templates/ingress.yaml
similarity index 100%
rename from kubernetes/oof/templates/ingress.yaml
rename to archive/oof/templates/ingress.yaml
diff --git a/kubernetes/oof/templates/secret.yaml b/archive/oof/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/templates/secret.yaml
rename to archive/oof/templates/secret.yaml
diff --git a/kubernetes/oof/templates/service.yaml b/archive/oof/templates/service.yaml
similarity index 100%
rename from kubernetes/oof/templates/service.yaml
rename to archive/oof/templates/service.yaml
diff --git a/kubernetes/oof/values.yaml b/archive/oof/values.yaml
similarity index 100%
rename from kubernetes/oof/values.yaml
rename to archive/oof/values.yaml
diff --git a/archive/policy/components/policy-gui/Chart.yaml b/archive/policy/components/policy-gui/Chart.yaml
new file mode 100644
index 0000000..28972b5
--- /dev/null
+++ b/archive/policy/components/policy-gui/Chart.yaml
@@ -0,0 +1,32 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021, 2024 Nordix Foundation
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+apiVersion: v2
+description: ONAP Policy GUI
+name: policy-gui
+version: 14.0.0
+
+dependencies:
+ - name: repositoryGenerator
+ version: ~13.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~13.x-0
+ repository: '@local'
diff --git a/archive/policy/components/policy-gui/resources/config/application.yml b/archive/policy/components/policy-gui/resources/config/application.yml
new file mode 100644
index 0000000..f81a1b4
--- /dev/null
+++ b/archive/policy/components/policy-gui/resources/config/application.yml
@@ -0,0 +1,19 @@
+server:
+ port: 2443
+ ssl:
+ enabled: false
+
+clamp:
+ url:
+ disable-ssl-validation: true
+ disable-ssl-hostname-check: true
+
+apex-editor:
+ upload-url:
+ upload-userid:
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: health, metrics, prometheus
diff --git a/archive/policy/components/policy-gui/resources/config/log/filebeat/filebeat.yml b/archive/policy/components/policy-gui/resources/config/log/filebeat/filebeat.yml
new file mode 100644
index 0000000..0b39517
--- /dev/null
+++ b/archive/policy/components/policy-gui/resources/config/log/filebeat/filebeat.yml
@@ -0,0 +1,59 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+filebeat.prospectors:
+#it is mandatory, in our case it's log
+- input_type: log
+ #This is the canolical path as mentioned in logback.xml, *.* means it will monitor all files in the directory.
+ paths:
+ - /var/log/onap/*/*/*/*.log
+ - /var/log/onap/*/*/*.log
+ - /var/log/onap/*/*.log
+ #Files older than this should be ignored.In our case it will be 48 hours i.e. 2 days. It is a helping flag for clean_inactive
+ ignore_older: 48h
+ # Remove the registry entry for a file that is more than the specified time. In our case it will be 96 hours, i.e. 4 days. It will help to keep registry records with in limit
+ clean_inactive: 96h
+
+# Name of the registry file. If a relative path is used, it is considered relative to the
+# data path. Else full qualified file name.
+#filebeat.registry_file: ${path.data}/registry
+
+
+output.logstash:
+ #List of logstash server ip addresses with port number.
+ #But, in our case, this will be the loadbalancer IP address.
+ #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
+ hosts: ["{{.Values.config.log.logstashServiceName}}:{{.Values.config.log.logstashPort}}"]
+ #If enable will do load balancing among availabe Logstash, automatically.
+ loadbalance: true
+
+ #The list of root certificates for server verifications.
+ #If certificate_authorities is empty or not set, the trusted
+ #certificate authorities of the host system are used.
+ #ssl.certificate_authorities: $ssl.certificate_authorities
+
+ #The path to the certificate for SSL client authentication. If the certificate is not specified,
+ #client authentication is not available.
+ #ssl.certificate: $ssl.certificate
+
+ #The client certificate key used for client authentication.
+ #ssl.key: $ssl.key
+
+ #The passphrase used to decrypt an encrypted key stored in the configured key file
+ #ssl.key_passphrase: $ssl.key_passphrase
diff --git a/archive/policy/components/policy-gui/resources/config/logback.xml b/archive/policy/components/policy-gui/resources/config/logback.xml
new file mode 100644
index 0000000..c20df83
--- /dev/null
+++ b/archive/policy/components/policy-gui/resources/config/logback.xml
@@ -0,0 +1,118 @@
+<!--
+ ============LICENSE_START=======================================================
+ policy-gui
+ ================================================================================
+ Copyright (C) 2021-2022 Nordix Foundation.
+ ================================================================================
+ 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.
+ ============LICENSE_END=========================================================
+ -->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>TRACE</level>
+ </filter>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+ </pattern>
+ </encoder>
+ </appender>
+
+ <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${POLICY_LOGS}/error.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${POLICY_LOGS}/error.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>TRACE</level>
+ </filter>
+ <encoder>
+ <pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="asyncError" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ERROR" />
+ </appender>
+
+ <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${POLICY_LOGS}/debug.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${POLICY_LOGS}/debug.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DEBUG" />
+ </appender>
+
+ <appender name="NETWORK" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${POLICY_LOGS}/network.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${POLICY_LOGS}/network.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="asyncNetwork" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NETWORK" />
+ </appender>
+
+ <logger name="network" level="TRACE" additivity="false">
+ <appender-ref ref="asyncNetwork" />
+ </logger>
+
+ <logger name="org.apache" level="TRACE" additivity="false">
+ <appender-ref ref="DEBUG" />
+ </logger>
+
+ <!-- Spring related loggers -->
+ <logger name="org.springframework" level="TRACE" additivity="false">
+ <appender-ref ref="DEBUG" />
+ </logger>
+
+ <!-- GUI related loggers -->
+ <logger name="org.onap.policy.gui" level="TRACE" additivity="false">
+ <appender-ref ref="ERROR" />
+ <appender-ref ref="DEBUG" />
+ </logger>
+
+ <!-- logback internals logging -->
+ <logger name="ch.qos.logback.classic" level="INFO" />
+ <logger name="ch.qos.logback.core" level="INFO" />
+
+ <root level="TRACE">
+ <appender-ref ref="asyncDebug" />
+ <appender-ref ref="asyncError" />
+ <appender-ref ref="asyncNetwork" />
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
diff --git a/archive/policy/components/policy-gui/templates/NOTES.txt b/archive/policy/components/policy-gui/templates/NOTES.txt
new file mode 100644
index 0000000..e44f333
--- /dev/null
+++ b/archive/policy/components/policy-gui/templates/NOTES.txt
@@ -0,0 +1,38 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+ http://{{ . }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+ export NODE_PORT=$(kubectl get --namespace {{ include "common.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.name" . }})
+ export NODE_IP=$(kubectl get nodes --namespace {{ include "common.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
+ echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get svc -w {{ include "common.name" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+ export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ template "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ echo "Visit https://127.0.0.1:8443 to use your application"
+ kubectl port-forward $POD_NAME 8443:{{ .Values.service.internalPort }}
+{{- end }}
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml b/archive/policy/components/policy-gui/templates/authorizationpolicy.yaml
similarity index 100%
copy from kubernetes/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
copy to archive/policy/components/policy-gui/templates/authorizationpolicy.yaml
diff --git a/archive/policy/components/policy-gui/templates/configmap.yaml b/archive/policy/components/policy-gui/templates/configmap.yaml
new file mode 100644
index 0000000..9426b0f
--- /dev/null
+++ b/archive/policy/components/policy-gui/templates/configmap.yaml
@@ -0,0 +1,34 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-configmap
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*.{xml,yaml,yml}").AsConfig . | indent 2 }}
+
+{{ include "common.log.configMap" . }}
diff --git a/archive/policy/components/policy-gui/templates/deployment.yaml b/archive/policy/components/policy-gui/templates/deployment.yaml
new file mode 100644
index 0000000..a236d5f
--- /dev/null
+++ b/archive/policy/components/policy-gui/templates/deployment.yaml
@@ -0,0 +1,127 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021-2022 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+spec:
+ selector: {{- include "common.selectors" . | nindent 4 }}
+ replicas: {{ .Values.replicaCount }}
+ template:
+ metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+ spec:
+ initContainers:
+ - command:
+ - sh
+ args:
+ - -c
+ - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done"
+ env:
+ - name: POLICY_LOGS
+ value: {{ .Values.log.path }}
+ volumeMounts:
+ - mountPath: /config-input
+ name: policy-gui-config
+ - mountPath: /config
+ name: policy-gui-config-processed
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-update-config
+ - command:
+ - /app/ready.py
+ args:
+ - --service-name
+ - policy-clamp-runtime-acm
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ include "repositoryGenerator.image.readiness" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "500Mi"
+ requests:
+ cpu: "3m"
+ memory: "20Mi"
+ containers:
+ # side car containers
+ {{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.sidecar" . | nindent 8 }}{{ end }}
+ # main container
+ - name: {{ include "common.name" . }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command: ["/opt/app/policy/gui/bin/policy-gui.sh"]
+ env:
+ - name: CLAMP_URL
+ value: http://policy-clamp-runtime-acm:6969
+ ports: {{ include "common.containerPorts" . | nindent 12 }}
+ # disable liveness probe when breakpoints set in debugger
+ # so K8s doesn't restart unresponsive container
+ {{- if eq .Values.liveness.enabled true }}
+ livenessProbe:
+ tcpSocket:
+ port: {{ .Values.service.internalPort }}
+ initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.liveness.periodSeconds }}
+ {{ end -}}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.service.internalPort }}
+ initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.readiness.periodSeconds }}
+ volumeMounts:
+ - name: logs
+ mountPath: {{ .Values.log.path }}
+ - mountPath: /opt/app/policy/gui/etc/application.yml
+ name: policy-gui-config-processed
+ subPath: application.yml
+ - mountPath: /opt/app/policy/gui/etc/logback.xml
+ name: policy-gui-config-processed
+ subPath: logback.xml
+ resources: {{ include "common.resources" . | nindent 12 }}
+ {{- if .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 10 }}
+ {{- end -}}
+ {{- if .Values.affinity }}
+ affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+ {{- end }}
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+ volumes:
+ - name: {{ include "common.fullname" . }}-config
+ configMap:
+ name: {{ include "common.fullname" . }}
+ - name: logs
+ emptyDir: {}
+ {{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.volumes" . | nindent 8 }}{{ end }}
+ - name: policy-gui-config
+ configMap:
+ name: {{ include "common.fullname" . }}-configmap
+ defaultMode: 0755
+ - name: policy-gui-config-processed
+ emptyDir:
+ medium: Memory
+ {{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/archive/policy/components/policy-gui/templates/ingress.yaml b/archive/policy/components/policy-gui/templates/ingress.yaml
new file mode 100644
index 0000000..e3dd7cb
--- /dev/null
+++ b/archive/policy/components/policy-gui/templates/ingress.yaml
@@ -0,0 +1,21 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+{{ include "common.ingress" . }}
diff --git a/archive/policy/components/policy-gui/templates/secrets.yaml b/archive/policy/components/policy-gui/templates/secrets.yaml
new file mode 100644
index 0000000..2af7fae
--- /dev/null
+++ b/archive/policy/components/policy-gui/templates/secrets.yaml
@@ -0,0 +1,21 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+{{ include "common.secretFast" . }}
diff --git a/archive/policy/components/policy-gui/templates/service.yaml b/archive/policy/components/policy-gui/templates/service.yaml
new file mode 100644
index 0000000..3640622
--- /dev/null
+++ b/archive/policy/components/policy-gui/templates/service.yaml
@@ -0,0 +1,21 @@
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+{{ include "common.service" . }}
diff --git a/archive/policy/components/policy-gui/values.yaml b/archive/policy/components/policy-gui/values.yaml
new file mode 100644
index 0000000..1533f82
--- /dev/null
+++ b/archive/policy/components/policy-gui/values.yaml
@@ -0,0 +1,130 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021-2022 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+#################################################################
+# Global configuration defaults.
+#################################################################
+global: # global defaults
+ nodePortPrefix: 304
+ centralizedLoggingEnabled: true
+
+subChartsOnly:
+ enabled: true
+
+flavor: small
+
+# application image
+image: onap/policy-gui:3.1.3
+pullPolicy: Always
+
+# flag to enable debugging - application support required
+debugEnabled: false
+
+# log configuration
+log:
+ path: /var/log/onap/policy/gui
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+config:
+ log:
+ logstashServiceName: log-ls
+ logstashPort: 5044
+ dataRootDir: /dockerdata-nfs
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 120
+ periodSeconds: 10
+ timeoutSeconds: 3
+ # necessary to disable liveness probe when setting breakpoints
+ # in debugger so K8s doesn't restart unresponsive container
+ enabled: true
+
+readiness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 3
+
+service:
+ type: NodePort
+ name: policy-gui
+ internalPort: 2443
+ ports:
+ - name: http
+ port: 2443
+ nodePort: 43
+
+ # see https://wiki.onap.org/display/DW/OOM+NodePort+List
+
+ingress:
+ enabled: false
+ service:
+ - baseaddr: "policy-ui"
+ name: "policy-gui"
+ port: 2443
+ config:
+ ssl: "redirect"
+
+serviceMesh:
+ authorizationPolicy:
+ authorizedPrincipals:
+ - serviceAccount: istio-ingress
+ namespace: istio-ingress
+
+ #resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ #
+ # Example:
+ # Configure resource requests and limits
+ # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+ # Minimum memory for development is 2 CPU cores and 4GB memory
+ # Minimum memory for production is 4 CPU cores and 8GB memory
+resources:
+ small:
+ limits:
+ cpu: "1"
+ memory: "700Mi"
+ requests:
+ cpu: "0.5"
+ memory: "700Mi"
+ large:
+ limits:
+ cpu: "2"
+ memory: "1.4Gi"
+ requests:
+ cpu: "1"
+ memory: "1.4Gi"
+ unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+ nameOverride: policy-gui
+ roles:
+ - read
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/archive/sdnc/components/dmaap-listener/Chart.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/Chart.yaml
rename to archive/sdnc/components/dmaap-listener/Chart.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/aai.properties b/archive/sdnc/components/dmaap-listener/resources/config/aai.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/aai.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/aai.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dblib.properties b/archive/sdnc/components/dmaap-listener/resources/config/dblib.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dblib.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dblib.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties b/archive/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/lcm.properties b/archive/sdnc/components/dmaap-listener/resources/config/lcm.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/lcm.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/lcm.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml b/archive/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
rename to archive/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/configmap.yaml b/archive/sdnc/components/dmaap-listener/templates/configmap.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/configmap.yaml
rename to archive/sdnc/components/dmaap-listener/templates/configmap.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/archive/sdnc/components/dmaap-listener/templates/deployment.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
rename to archive/sdnc/components/dmaap-listener/templates/deployment.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/secret.yaml b/archive/sdnc/components/dmaap-listener/templates/secret.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/secret.yaml
rename to archive/sdnc/components/dmaap-listener/templates/secret.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/service.yaml b/archive/sdnc/components/dmaap-listener/templates/service.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/service.yaml
rename to archive/sdnc/components/dmaap-listener/templates/service.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/archive/sdnc/components/dmaap-listener/values.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/values.yaml
rename to archive/sdnc/components/dmaap-listener/values.yaml
diff --git a/kubernetes/vfc/.helmignore b/archive/vfc/.helmignore
similarity index 100%
rename from kubernetes/vfc/.helmignore
rename to archive/vfc/.helmignore
diff --git a/kubernetes/vfc/Chart.yaml b/archive/vfc/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/Chart.yaml
rename to archive/vfc/Chart.yaml
diff --git a/kubernetes/vfc/Makefile b/archive/vfc/Makefile
similarity index 100%
rename from kubernetes/vfc/Makefile
rename to archive/vfc/Makefile
diff --git a/kubernetes/vfc/components/Makefile b/archive/vfc/components/Makefile
similarity index 100%
rename from kubernetes/vfc/components/Makefile
rename to archive/vfc/components/Makefile
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore b/archive/vfc/components/vfc-generic-vnfm-driver/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore
rename to archive/vfc/components/vfc-generic-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml b/archive/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/values.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore b/archive/vfc/components/vfc-huawei-vnfm-driver/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore
rename to archive/vfc/components/vfc-huawei-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties b/archive/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
rename to archive/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/values.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/.helmignore b/archive/vfc/components/vfc-nslcm/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/.helmignore
rename to archive/vfc/components/vfc-nslcm/.helmignore
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/archive/vfc/components/vfc-nslcm/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/Chart.yaml
rename to archive/vfc/components/vfc-nslcm/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml b/archive/vfc/components/vfc-nslcm/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-nslcm/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml b/archive/vfc/components/vfc-nslcm/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml
rename to archive/vfc/components/vfc-nslcm/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/archive/vfc/components/vfc-nslcm/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
rename to archive/vfc/components/vfc-nslcm/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml b/archive/vfc/components/vfc-nslcm/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml
rename to archive/vfc/components/vfc-nslcm/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml b/archive/vfc/components/vfc-nslcm/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
rename to archive/vfc/components/vfc-nslcm/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/archive/vfc/components/vfc-nslcm/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/values.yaml
rename to archive/vfc/components/vfc-nslcm/values.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/.helmignore b/archive/vfc/components/vfc-redis/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/.helmignore
rename to archive/vfc/components/vfc-redis/.helmignore
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/archive/vfc/components/vfc-redis/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/Chart.yaml
rename to archive/vfc/components/vfc-redis/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/templates/deployment.yaml b/archive/vfc/components/vfc-redis/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/templates/deployment.yaml
rename to archive/vfc/components/vfc-redis/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/templates/service.yaml b/archive/vfc/components/vfc-redis/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/templates/service.yaml
rename to archive/vfc/components/vfc-redis/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/values.yaml b/archive/vfc/components/vfc-redis/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/values.yaml
rename to archive/vfc/components/vfc-redis/values.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/.helmignore b/archive/vfc/components/vfc-vnflcm/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/.helmignore
rename to archive/vfc/components/vfc-vnflcm/.helmignore
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/archive/vfc/components/vfc-vnflcm/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
rename to archive/vfc/components/vfc-vnflcm/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml b/archive/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml b/archive/vfc/components/vfc-vnflcm/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/archive/vfc/components/vfc-vnflcm/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml b/archive/vfc/components/vfc-vnflcm/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml b/archive/vfc/components/vfc-vnflcm/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/archive/vfc/components/vfc-vnflcm/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/values.yaml
rename to archive/vfc/components/vfc-vnflcm/values.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/.helmignore b/archive/vfc/components/vfc-vnfmgr/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/.helmignore
rename to archive/vfc/components/vfc-vnfmgr/.helmignore
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/archive/vfc/components/vfc-vnfmgr/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
rename to archive/vfc/components/vfc-vnfmgr/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml b/archive/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml b/archive/vfc/components/vfc-vnfmgr/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/archive/vfc/components/vfc-vnfmgr/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml b/archive/vfc/components/vfc-vnfmgr/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml b/archive/vfc/components/vfc-vnfmgr/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/archive/vfc/components/vfc-vnfmgr/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/values.yaml
rename to archive/vfc/components/vfc-vnfmgr/values.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/.helmignore b/archive/vfc/components/vfc-vnfres/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/.helmignore
rename to archive/vfc/components/vfc-vnfres/.helmignore
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/archive/vfc/components/vfc-vnfres/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/Chart.yaml
rename to archive/vfc/components/vfc-vnfres/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml b/archive/vfc/components/vfc-vnfres/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-vnfres/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml b/archive/vfc/components/vfc-vnfres/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml
rename to archive/vfc/components/vfc-vnfres/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/archive/vfc/components/vfc-vnfres/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
rename to archive/vfc/components/vfc-vnfres/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml b/archive/vfc/components/vfc-vnfres/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml
rename to archive/vfc/components/vfc-vnfres/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml b/archive/vfc/components/vfc-vnfres/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
rename to archive/vfc/components/vfc-vnfres/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/archive/vfc/components/vfc-vnfres/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/values.yaml
rename to archive/vfc/components/vfc-vnfres/values.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore b/archive/vfc/components/vfc-zte-vnfm-driver/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore
rename to archive/vfc/components/vfc-zte-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml b/archive/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/values.yaml
diff --git a/kubernetes/vfc/resources/config/log/filebeat/filebeat.yml b/archive/vfc/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/vfc/resources/config/log/filebeat/filebeat.yml
rename to archive/vfc/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/vfc/templates/configmap.yaml b/archive/vfc/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/templates/configmap.yaml
rename to archive/vfc/templates/configmap.yaml
diff --git a/kubernetes/vfc/templates/secrets.yaml b/archive/vfc/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/templates/secrets.yaml
rename to archive/vfc/templates/secrets.yaml
diff --git a/kubernetes/vfc/values.yaml b/archive/vfc/values.yaml
similarity index 100%
rename from kubernetes/vfc/values.yaml
rename to archive/vfc/values.yaml
diff --git a/kubernetes/vnfsdk/Chart.yaml b/archive/vnfsdk/Chart.yaml
similarity index 100%
rename from kubernetes/vnfsdk/Chart.yaml
rename to archive/vnfsdk/Chart.yaml
diff --git a/kubernetes/vnfsdk/resources/config/configuration.xml b/archive/vnfsdk/resources/config/configuration.xml
similarity index 100%
rename from kubernetes/vnfsdk/resources/config/configuration.xml
rename to archive/vnfsdk/resources/config/configuration.xml
diff --git a/kubernetes/vnfsdk/resources/config/marketplace_tables_postgres.sql b/archive/vnfsdk/resources/config/marketplace_tables_postgres.sql
similarity index 100%
rename from kubernetes/vnfsdk/resources/config/marketplace_tables_postgres.sql
rename to archive/vnfsdk/resources/config/marketplace_tables_postgres.sql
diff --git a/kubernetes/vnfsdk/resources/nginx/nginx.conf b/archive/vnfsdk/resources/nginx/nginx.conf
similarity index 100%
rename from kubernetes/vnfsdk/resources/nginx/nginx.conf
rename to archive/vnfsdk/resources/nginx/nginx.conf
diff --git a/kubernetes/vnfsdk/templates/NOTES.txt b/archive/vnfsdk/templates/NOTES.txt
similarity index 100%
rename from kubernetes/vnfsdk/templates/NOTES.txt
rename to archive/vnfsdk/templates/NOTES.txt
diff --git a/kubernetes/vnfsdk/templates/configmap.yaml b/archive/vnfsdk/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/configmap.yaml
rename to archive/vnfsdk/templates/configmap.yaml
diff --git a/kubernetes/vnfsdk/templates/deployment.yaml b/archive/vnfsdk/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/deployment.yaml
rename to archive/vnfsdk/templates/deployment.yaml
diff --git a/kubernetes/vnfsdk/templates/ingress.yaml b/archive/vnfsdk/templates/ingress.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/ingress.yaml
rename to archive/vnfsdk/templates/ingress.yaml
diff --git a/kubernetes/vnfsdk/templates/job.yaml b/archive/vnfsdk/templates/job.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/job.yaml
rename to archive/vnfsdk/templates/job.yaml
diff --git a/kubernetes/vnfsdk/templates/secrets.yaml b/archive/vnfsdk/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/secrets.yaml
rename to archive/vnfsdk/templates/secrets.yaml
diff --git a/kubernetes/vnfsdk/templates/service.yaml b/archive/vnfsdk/templates/service.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/service.yaml
rename to archive/vnfsdk/templates/service.yaml
diff --git a/kubernetes/vnfsdk/values.yaml b/archive/vnfsdk/values.yaml
similarity index 100%
rename from kubernetes/vnfsdk/values.yaml
rename to archive/vnfsdk/values.yaml
diff --git a/docs/_static/logo_onap_2024.png b/docs/_static/logo_onap_2024.png
new file mode 100644
index 0000000..55d307f
--- /dev/null
+++ b/docs/_static/logo_onap_2024.png
Binary files differ
diff --git a/docs/conf.py b/docs/conf.py
index 16ad9a9..3a63e0f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -11,7 +11,7 @@
html_theme_options = {
"style_nav_header_background": "white",
"sticky_navigation": "False" }
-html_logo = "_static/logo_onap_2017.png"
+html_logo = "_static/logo_onap_2024.png"
html_favicon = "_static/favicon.ico"
html_static_path = ["_static"]
html_show_sphinx = False
diff --git a/kubernetes/authentication/Chart.yaml b/kubernetes/authentication/Chart.yaml
index a3ac43c..e8400ae 100644
--- a/kubernetes/authentication/Chart.yaml
+++ b/kubernetes/authentication/Chart.yaml
@@ -16,7 +16,7 @@
# limitations under the License.
# ============LICENSE_END=========================================================
apiVersion: v2
-version: 14.0.0
+version: 14.0.1
description: ONAP Realm creation, Oauth2Proxy installation and configuration
name: authentication
sources:
diff --git a/kubernetes/authentication/README.md b/kubernetes/authentication/README.md
index 75d8f05..306e2f9 100644
--- a/kubernetes/authentication/README.md
+++ b/kubernetes/authentication/README.md
@@ -1,7 +1,29 @@
-TBD: Description about settings...
+# Helm Chart for Authentication Application
+This component delivers:
-```
+- Keycloak Realm creation and import
+- (Optionally) creation of AuthenticationPolicies for Ingress to enable
+ OAuth Authentication and RoleBased access to Ingress APIs and UIs
+
+## REALM Configuration settings
+
+- In the configuration section "realmSettings" multiple REALMs can be configured
+- Each REALM configuration has the following sections:
+ - [General REALM settings](#general-realm-settings)
+ - [CLIENT definitions](#client-definitions)
+ - (optional) [CLIENT SCOPE definitions](#client-scope-definitions)
+ - (optional) [Access control definitions](#access-control-definitions)
+ - (optional) [GROUP definitions](#group-definitions)
+ - (optional) [USER definitions](#user-definitions)
+ - (optional) [IDENTITY PROVIDER definitions](#identity-provider-and-mapper-definitions)
+ - (optional) [SMTP server definitions](#smtp-server-definitions)
+
+### General REALM settings
+
+This sections sets the realm general attributes shown in Keycloak
+
+```yaml
realmSettings:
- name: <Realm ID> - unique ID for a realm (e.g. "ONAP")
displayName: <Display Name> - (optional) Keycloak Display Name (e.g. "ONAP Realm")
@@ -10,45 +32,274 @@
admin: <admin theme> - (optional) Keycloak Theme for Admin UI (e.g. "base")
account: <account theme> - (optional) Keycloak Theme for Account UI (e.g. "base")
email: <email theme> - (optional) Keycloak Theme for Email UI (e.g. "base")
- groups: - (optional) Group definitions
- - name: <group name> - Group name
- path: /path> - Group URL path
- realmRoles: [ <role>,... ] - (optional) List of Realm roles
- initialUsers: - (optional) List of initial users
- - username: <user name> - Name of the User
- password: <password> - Initial Password
- email: <email> - Email Address
- firstName: <first name> - (optional) First Name
- lastName: <last name> - (optional) Last Name
- groups: - (optional) group membership
- - <group name>
+ attributes:
+ frontendUrl: "<Keycloak URL>" - External Url for Keycloak access (e.g. "https://keycloak-$PARAM_BASE_URL/")
```
-```
+### CLIENT definitions
+
+In this section each realm authentication client is defined e.g. portal-bff, oauth2-proxy, grafana
+
+possible "attribute" settings (maybe more):
+ - id.token.as.detached.signature: "false"
+ - exclude.session.state.from.auth.response: "false"
+ - tls.client.certificate.bound.access.tokens: "false"
+ - saml.allow.ecp.flow: "false"
+ - saml.assertion.signature: "false"
+ - saml.force.post.binding: "false"
+ - saml.multivalued.roles: "false"
+ - saml.encrypt: "false"
+ - saml.server.signature: "false"
+ - saml.server.signature.keyinfo.ext: "false"
+ - saml.artifact.binding: "false"
+ - saml_force_name_id_format: "false"
+ - saml.client.signature: "false"
+ - saml.authnstatement: "false"
+ - saml.onetimeuse.condition: "false"
+ - oidc.ciba.grant.enabled: "false"
+ - frontchannel.logout.session.required: "true"
+ - backchannel.logout.session.required: "true"
+ - backchannel.logout.revoke.offline.tokens: "false"
+ - client_credentials.use_refresh_token: "false"
+ - acr.loa.map: "{}"
+ - require.pushed.authorization.requests: "false"
+ - oauth2.device.authorization.grant.enabled: "false"
+ - display.on.consent.screen: "false"
+ - token.response.type.bearer.lower-case: "false"
+ - use.refresh.tokens: "true"
+ - post.logout.redirect.uris: '<url>'
+
+```yaml
clients:
oauth2_proxy:
- clientId: "oauth2-proxy-onap"
- name: "Oauth2 Proxy"
- secret: 5YSOkJz99WHv8enDZPknzJuGqVSerELp
- protocol: openid-connect
- portal_app:
- clientId: "portal-app"
+ clientId: "<client ID>" - client ID
+ name: "<client name>" - (optional) client name
+ secret: <client secret> - (optional) client secret
+ clientAuthenticatorType: <type> - (optional) auth type (default: client-secret)
+ protocol: <protocol> - (optional) auth protocol (default: openid-connect)
+ description: "<description>" - (optional) client description
+ baseUrl: "<base path>" - (optional) url subpath (e.g. /application)
+ rootUrl: "<root URL>" - (optional) root url
+ adminUrl: "<admin URL>" - (optional) admin url
+ bearerOnly: "<false|true>" - (optional) bearerOnly (default: false)
+ consentRequired: "<false|true>" - (optional) consentRequired (default: false)
+ standardFlowEnabled: "<false|true>" - (optional) standardFlowEnabled (default: true)
+ implicitFlowEnabled: "<false|true>" - (optional) implicitFlowEnabled (default: false)
+ directAccessGrantsEnabled: "<false|true>" - (optional) directAccessGrantsEnabled (default: true)
+ serviceAccountsEnabled: "<false|true>" - (optional) serviceAccountsEnabled (default: false)
+ frontchannelLogout: "<false|true>" - (optional) frontend channel logout (default: true)
+ surrogateAuthRequired: "<false|true>" - (optional) surrogate Auth Required (default: false)
+ publicClient: "<false|true>" - (optional) public Client (default: false)
+ attributes: - (optional) attributes settings (see code)
+ post.logout.redirect.uris: '<url>' - example
+ protocolMappers: - (optional) protocol mappers
+ - name: "Audience for Oauth2Proxy" - examples
+ protocolMapper: "oidc-audience-mapper"
+ config:
+ included.client.audience: "oauth2-proxy-onap"
+ id.token.claim: "false"
+ access.token.claim: "true"
+ included.custom.audience: "oauth2-proxy-onap"
+ - name: "SDC-User"
+ protocolMapper: "oidc-usermodel-attribute-mapper"
+ config:
+ multivalued: "false"
+ userinfo.token.claim: "true"
+ user.attribute: "sdc_user"
+ id.token.claim: "true"
+ access.token.claim: "true"
+ claim.name: "sdc_user"
+ jsonType.label: "String"
+ additionalDefaultScopes:
+ - "onap_roles"
redirectUris:
- "https://portal-$PARAM_BASE_URL/*"
- "http://localhost/*"
- protocol: openid-connect
+ webOrigins:
+ - "https://argocd-$PARAM_BASE_URL"
+ defaultClientScopes:
+ - "web-origins"
+ - "profile"
+ - "acr"
+ - "email"
+ - "roles"
+ - "groups"
```
+### CLIENT SCOPE definitions
+
+Here additional scopes besides the default scopes can be defined and set as default client scope
+
+default scopes:
+
+ - roles
+ - groups
+ - acr
+ - profile
+ - address
+ - web-origin
+ - phone
+ - email
+ - offline_access
+ - role_list
+ - microprofile-jwt
+
+```yaml
+ defaultClientScopes:
+ - "onap_roles"
+ additionalClientScopes:
+ - name: onap_roles
+ description: OpenID Connect scope for add user onap roles to the access token
+ protocolMappers:
+ - name: aud
+ protocol: openid-connect
+ protocolMapper: oidc-audience-mapper
+ consentRequired: false
+ config:
+ included.client.audience: oauth2-proxy
+ id.token.claim: 'false'
+ access.token.claim: 'true'
+ - name: client roles
+ protocol: openid-connect
+ protocolMapper: oidc-usermodel-client-role-mapper
+ consentRequired: false
+ config:
+ multivalued: 'true'
+ userinfo.token.claim: 'false'
+ id.token.claim: 'true'
+ access.token.claim: 'true'
+ claim.name: onap_roles
+ jsonType.label: String
+ usermodel.clientRoleMapping.clientId: oauth2-proxy
```
+
+### Access control definitions
+
+In this section additional roles (assignableRoles) besides the default roles can be set.
+
+default roles:
+ - user
+ - admin
+ - offline_access
+ - uma_authorization
+ - default-roles-<realm>
+
+(optional) accessRoles can be defined.
+These access roles are used in the Ingress "Auhorization Policy" to restrict the access to certain services
+The access role is assigned to a realm client (e.g. oauth2_proxy)
+
+```yaml
accessControl:
assignableRoles:
- name: onap-operator-read
description: "Allows to perform GET operations for all ONAP components"
- associatedAccessRoles: [ "dmaap-bc-api-read", "dmaap-dr-node-api-read", "dmaap-dr-prov-api-read", "dmaap-mr-api-read", "msb-consul-api-read", "msb-discovery-api-read", "msb-eag-ui-read", "msb-iag-ui-read", "nbi-api-read", "aai-api-read", "aai-babel-api-read", "aai-sparkybe-api-read", "cds-blueprintsprocessor-api-read", "cds-ui-read", "cps-core-api-read", "cps-ncmp-dmi-plugin-api-read", "cps-temporal-api-read", "reaper-dc1-read", "sdc-be-api-read", "sdc-fe-ui-read", "sdc-wfd-be-api-read", "sdc-wfd-fe-ui-read", "so-admin-cockpit-ui-read", "so-api-read", "usecase-ui-read", "uui-server-read" ]
-
+ associatedAccessRoles: [ "dmaap-bc-api-read", ... ]
accessRoles:
"oauth2_proxy":
- name: dmaap-bc-api-read
methodsAllowed: ["GET"]
servicePrefix: dmaap-bc-api
-```
\ No newline at end of file
+```
+
+### GROUP definitions
+
+```yaml
+ groups: - (optional) Group definitions
+ - name: <group name> - Group name
+ path: /path> - Group URL path
+ roles: [ <role>,... ] - (optional) List of Realm roles
+```
+
+### USER definitions
+
+```yaml
+ initialUsers: - (optional) List of initial users
+ - username: <user name> - Name of the User
+ firstName: <first name> - (optional) First Name
+ lastName: <last name> - (optional) Last Name
+ email: <email> - (optional) Email Address
+ emailVerified : <true|false>- (optional)Email verified
+ credentials: - (optional) credentials
+ - type: password - (optional) initial password (<pwd>: encrypted password, <salt>: used salt)
+ secretData: "{\"value\":\"<pwd>\",\"salt\":\"<salt>\"}"
+ credentialData: "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+ attributes: - (optional) additional attributes
+ sdc_user: - example attribute
+ - "cs0008"
+ realmRoles: - (optional) assigned realm roles
+ - <role name>
+ groups: - (optional) group membership
+ - <group name>
+```
+
+### Identity Provider and Mapper definitions
+
+```yaml
+ identityProviders:
+ - name: "gitlab"
+ displayName: "gitlab"
+ config:
+ userInfoUrl: "https://gitlab.devops.telekom.de/oauth/userinfo"
+ validateSignature: "true"
+ clientId: "ee4e0db734157e9cdad16733656ba285f2f813354aa7c590a8693e48ed156860"
+ tokenUrl: "https://gitlab.devops.telekom.de/oauth/token"
+ jwksUrl: "https://gitlab.devops.telekom.de/oauth/discovery/keys"
+ issuer: "https://gitlab.devops.telekom.de"
+ useJwksUrl: "true"
+ authorizationUrl: "https://gitlab.devops.telekom.de/oauth/authorize"
+ clientAuthMethod: "client_secret_post"
+ syncMode: "IMPORT"
+ clientSecret: "gloas-35267790bf6fb7c4b507aea11db46d80174cb8ef4192e77424803b595eef735e"
+ defaultScope: "openid read_user email"
+ identityProviderMappers:
+ - name: "argo-admins"
+ identityProviderAlias: "gitlab"
+ identityProviderMapper: "oidc-advanced-group-idp-mapper"
+ config:
+ claims: "[{\"key\":\"groups_direct\",\"value\":\"dt-rc\"}]"
+ syncMode: "FORCE"
+ group: "/ArgoCDAdmins"
+ - name: "ArgoCDRestricted"
+ identityProviderAlias: "gitlab"
+ identityProviderMapper: "oidc-advanced-group-idp-mapper"
+ config:
+ claims: "[{\"key\":\"groups_direct\",\"value\":\"\"}]"
+ syncMode: "FORCE"
+ group: "/ArgoCDRestricted"
+ - name: "lastName "
+ identityProviderAlias: "gitlab"
+ identityProviderMapper: "oidc-user-attribute-idp-mapper"
+ config:
+ claim: "nickname"
+ syncMode: "FORCE"
+ user.attribute: "lastName"
+```
+
+### SMTP Server definitions
+
+```yaml
+ smtpServer:
+ password: "<password>"
+ starttls: "true"
+ auth: "true"
+ port: "587"
+ host: "<mailserver>"
+ from: "<mail-address>"
+ fromDisplayName: "onapsupport"
+ ssl: "false"
+ user: "onapsupport"
+```
+
+## Ingress Authentication settings
+
+Activating the Ingress Authentication (enabled: true) will create AuthorizationPolicy resources for each defined "accessControl.accessRoles" in a REALM definition.
+
+```
+ingressAuthentication:
+ enabled: false
+ exceptions:
+ - '{{ include "ingress.config.host" (dict "dot" . "baseaddr" "keycloak-ui") }}'
+ - '{{ include "ingress.config.host" (dict "dot" . "baseaddr" "portal-ui") }}'
+ - '{{ include "ingress.config.host" (dict "dot" . "baseaddr" "minio-console") }}'
+ - '{{ include "ingress.config.host" (dict "dot" . "baseaddr" "uui-server") }}'
+```
diff --git a/kubernetes/authentication/templates/_utils.tpl b/kubernetes/authentication/templates/_utils.tpl
index 0cdcd79..806f961 100644
--- a/kubernetes/authentication/templates/_utils.tpl
+++ b/kubernetes/authentication/templates/_utils.tpl
@@ -45,6 +45,7 @@
{{ include "auth._users" $realm }}
{{ include "auth._identity" $realm }}
{{ include "auth._identityMapper" $realm }}
+{{ include "auth._smtpServer" $realm }}
{{ include "auth._attributes" (dict "dot" $dot "realm" $realm) }}
{{- end -}}
@@ -142,84 +143,60 @@
clients:
{{- range $index, $client := $realm.clients }}
- clientId: "{{ $client.clientId }}"
+ {{- if $client.name }}
name: "{{ $client.name }}"
- description: "{{ default "" $client.description }}"
+ {{- end }}
+ {{- if $client.description }}
+ description: "{{ $client.description }}"
+ {{- end }}
{{- if $client.rootUrl }}
rootUrl: {{ tpl $client.rootUrl $dot }}
- {{- else }}
- rootUrl: ""
{{- end }}
{{- if $client.adminUrl }}
adminUrl: {{ tpl $client.adminUrl $dot }}
- {{- else }}
- adminUrl: ""
{{- end }}
{{- if $client.baseUrl }}
baseUrl: {{ tpl $client.baseUrl $dot }}
- {{- else }}
- baseUrl: ""
{{- end }}
- surrogateAuthRequired: false
+ surrogateAuthRequired: {{ default false $client.surrogateAuthRequired }}
enabled: true
alwaysDisplayInConsole: false
- clientAuthenticatorType: "client-secret"
- secret: "{{ default "" $client.secret }}"
+ clientAuthenticatorType: {{ default "client-secret" $client.clientAuthenticatorType }}
+ {{- if $client.secret }}
+ secret: "{{ $client.secret }}"
+ {{- end }}
+ {{- if $client.redirectUris }}
redirectUris:
- {{- if $client.redirectUris }}
{{- range $index2, $url := $client.redirectUris }}
- {{ tpl $url $dot }}
{{- end }}
- {{- else }}
- - "*"
- {{- end }}
- {{- if $client.webOrigins }}
+ {{- else }}
+ redirectUris: []
+ {{- end }}
+ {{- if $client.webOrigins }}
webOrigins:
{{- range $index3, $web := $client.webOrigins }}
- - {{ $web }}
+ - {{ $web | quote }}
{{- end }}
- {{- else }}
+ {{- else }}
webOrigins: []
- {{- end }}
+ {{- end }}
notBefore: 0
- bearerOnly: false
- consentRequired: false
- standardFlowEnabled: true
- implicitFlowEnabled: false
- directAccessGrantsEnabled: true
- serviceAccountsEnabled: false
- publicClient: false
- frontchannelLogout: true
- protocol: "{{ $client.protocol }}"
+ bearerOnly: {{ default false $client.bearerOnly }}
+ consentRequired: {{ default false $client.consentRequired }}
+ standardFlowEnabled: {{ default true $client.standardFlowEnabled }}
+ implicitFlowEnabled: {{ default false $client.implicitFlowEnabled }}
+ directAccessGrantsEnabled: {{ default true $client.directAccessGrantsEnabled }}
+ serviceAccountsEnabled: {{ default false $client.serviceAccountsEnabled }}
+ publicClient: {{ default false $client.publicClient }}
+ frontchannelLogout: {{ default false $client.frontchannelLogout }}
+ protocol: "{{ default "openid-connect" $client.protocol }}"
+ {{- if $client.attributes }}
attributes:
- id.token.as.detached.signature: "false"
- saml.assertion.signature: "false"
- saml.force.post.binding: "false"
- saml.multivalued.roles: "false"
- saml.encrypt: "false"
- saml.server.signature: "false"
- saml.server.signature.keyinfo.ext: "false"
- exclude.session.state.from.auth.response: "false"
- saml.artifact.binding: "false"
- saml_force_name_id_format: "false"
- saml.client.signature: "false"
- saml.authnstatement: "false"
- saml.onetimeuse.condition: "false"
- tls-client-certificate-bound-access-tokens: "false"
- oidc.ciba.grant.enabled: "false"
- backchannel.logout.session.required: "true"
- client_credentials.use_refresh_token: "false"
- acr.loa.map: "{}"
- require.pushed.authorization.requests: "false"
- oauth2.device.authorization.grant.enabled: "false"
- display.on.consent.screen: "false"
- backchannel.logout.revoke.offline.tokens: "false"
- token.response.type.bearer.lower-case: "false"
- use.refresh.tokens: "true"
- {{- if $client.additionalAttributes }}
- {{- range $key,$value := $client.additionalAttributes }}
+ {{- range $key,$value := $client.attributes }}
{{ $key }}: {{ tpl $value $dot }}
{{- end }}
- {{- end }}
+ {{- end }}
authenticationFlowBindingOverrides: {}
fullScopeAllowed: true
nodeReRegistrationTimeout: -1
@@ -235,21 +212,27 @@
{{- end }}
{{- end }}
defaultClientScopes:
- - web-origins
- - acr
- - profile
- - email
- {{- if $client.additionalDefaultScopes }}
- {{- range $index2, $scope := $client.additionalDefaultScopes }}
+ {{- if $client.defaultClientScopes }}
+ {{- range $index2, $scope := $client.defaultClientScopes }}
- {{ $scope }}
{{- end }}
+ {{- else }}
+ - web-origins
+ - profile
+ - acr
+ - email
{{- end }}
optionalClientScopes:
+ {{- if $client.optionalClientScopes }}
+ {{- range $index2, $scope := $client.optionalClientScopes }}
+ - {{ $scope }}
+ {{- end }}
+ {{- else }}
- address
- phone
- offline_access
- - groups
- microprofile-jwt
+ {{- end }}
{{- end }}
{{- end }}
@@ -716,7 +699,9 @@
enabled: true
totp: false
email: "{{ default "" $user.email }}"
- emailVerified: true
+ emailVerified: "{{ default true $user.emailVerified }}"
+ firstName: "{{ default "" $user.firstName }}"
+ lastName: "{{ default "" $user.lastName }}"
{{- if $user.attributes }}
attributes:
{{ toYaml $user.attributes | nindent 6 }}
@@ -800,6 +785,19 @@
{{- end }}
{{/*
+Renders the smtpServer section in a realm.
+Usage:
+{{ include "auth._smtpServer" ( dict "dot" .Values) }}
+*/}}
+{{- define "auth._smtpServer" -}}
+{{- $dot := default . .dot -}}
+{{- if $dot.smtpServer }}
+smtpServer:
+ {{ toYaml $dot.smtpServer | nindent 2 }}
+{{- end }}
+{{- end }}
+
+{{/*
Renders the attributes section in a realm.
Usage:
{{ include "auth._attributes" ( dict "dot" . "realm" $realm ) }}
@@ -808,6 +806,6 @@
{{- $dot := default . .dot -}}
{{- $realm := (required "'realm' param, set to the specific service, is required." .realm) -}}
attributes:
- frontentUrl: {{ tpl $realm.attributes.frontendUrl $dot }}
+ frontendUrl: {{ tpl $realm.attributes.frontendUrl $dot }}
acr.loa.map: "{\"ABC\":\"5\"}"
{{- end }}
diff --git a/kubernetes/authentication/templates/authorizationpolicy.yaml b/kubernetes/authentication/templates/authorizationpolicy.yaml
index f4857bd..abd4072 100644
--- a/kubernetes/authentication/templates/authorizationpolicy.yaml
+++ b/kubernetes/authentication/templates/authorizationpolicy.yaml
@@ -87,4 +87,4 @@
selector:
matchLabels:
istio: ingress
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/authentication/templates/requestauthentication.yaml b/kubernetes/authentication/templates/requestauthentication.yaml
index 036680d..92bea9f 100644
--- a/kubernetes/authentication/templates/requestauthentication.yaml
+++ b/kubernetes/authentication/templates/requestauthentication.yaml
@@ -33,4 +33,4 @@
- issuer: "https://{{ include "ingress.config.host" (dict "dot" $dot "baseaddr" "keycloak-ui") }}/{{ .Values.keycloak.relativePath }}realms/master"
jwksUri: {{ .Values.keycloak.intURL }}realms/master/protocol/openid-connect/certs
forwardOriginalToken: true
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/authentication/values.yaml b/kubernetes/authentication/values.yaml
index 94e9f70..ba99879 100644
--- a/kubernetes/authentication/values.yaml
+++ b/kubernetes/authentication/values.yaml
@@ -49,8 +49,60 @@
secrets:
KEYCLOAK_PASSWORD: secret
existingConfigSecret: "keycloak-config-cli-config-realms"
+ securityContext:
+ runAsGroup: 65534
+ runAsNonRoot: true
+ runAsUser: 65534
+ seccompProfile:
+ type: RuntimeDefault
+ containerSecurityContext:
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ - CAP_NET_RAW
+ readOnlyRootFilesystem: true
+ resources:
+ limits:
+ cpu: "1"
+ memory: 500Mi
+ requests:
+ cpu: 100m
+ memory: 10Mi
onap-oauth2-proxy:
+ securityContext:
+ capabilities:
+ drop:
+ - ALL
+ - CAP_NET_RAW
+
+ resources:
+ limits:
+ cpu: 500m
+ memory: 500Mi
+ requests:
+ cpu: 500m
+ memory: 500Mi
+
+ initContainers:
+ waitForRedis:
+ #image:
+ # repository: "dockerhub.devops.telekom.de/alpine"
+ # tag: "3.20"
+ securityContext:
+ capabilities:
+ drop:
+ - ALL
+ - CAP_NET_RAW
+ resources:
+ limits:
+ cpu: 100m
+ memory: 300Mi
+ requests:
+ cpu: 100m
+ memory: 300Mi
+
# Oauth client configuration specifics
config:
# Create a new secret with the following command
@@ -99,8 +151,19 @@
redis:
# provision an instance of the redis sub-chart
enabled: true
+ master:
+ containerSecurityContext:
+ capabilities:
+ drop: ["ALL", "CAP_NET_RAW"]
+ replica:
+ containerSecurityContext:
+ capabilities:
+ drop: ["ALL", "CAP_NET_RAW"]
sentinel:
enabled: true
+ containerSecurityContext:
+ capabilities:
+ drop: ["ALL", "CAP_NET_RAW"]
serviceAccount:
nameOverride: keycloak-init
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 81f5c5d..544ebb2 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: ONAP cassandra
name: cassandra
-version: 13.1.0
+version: 13.1.1
dependencies:
- name: common
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 0ab1f09..842c268 100644
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -40,16 +40,30 @@
superuserPassword: &superuserpassword cassandra
casOptions:
authorizer: AllowAllAuthorizer
- read_request_timeout: 10000ms
- write_request_timeout: 10000ms
+ read_request_timeout: 15000ms
+ write_request_timeout: 15000ms
counter_write_request_timeout: 15000ms
+ request_timeout: 15000ms
+ auto_snapshot: false
+ commitlog_segment_size: 128MiB
+ commitlog_sync_period: 15000ms
+ concurrent_reads: 16
+ concurrent_writes: 16
+ counter_cache_size: 16MiB
jvmOptions:
heap_initial_size: 512M
- heap_max_size: 8192M
+ heap_max_size: 4096M
hostNetwork: false
datacenters:
- name: dc1
size: 3
+ resources:
+ requests:
+ cpu: 2
+ memory: 8Gi
+ limits:
+ cpu: 8
+ memory: 8Gi
reaper:
enabled: true
stargate:
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 10894bd..6fa2926 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -17,4 +17,4 @@
apiVersion: v2
description: Common templates for inclusion in other charts
name: common
-version: 13.2.3
+version: 13.2.6
diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl
index 588af1a..c707312 100644
--- a/kubernetes/common/common/templates/_cassOp.tpl
+++ b/kubernetes/common/common/templates/_cassOp.tpl
@@ -133,6 +133,10 @@
- metadata:
name: {{ $datacenter.name }}
size: {{ $datacenter.size }}
+ {{ if $datacenter.resources -}}
+ resources:
+ {{ toYaml $datacenter.resources | nindent 10 }}
+ {{- end }}
{{- end }}
initContainers:
- name: server-config-init-base
diff --git a/kubernetes/common/common/templates/_pod.tpl b/kubernetes/common/common/templates/_pod.tpl
index 0a1d0ab..743e3db 100644
--- a/kubernetes/common/common/templates/_pod.tpl
+++ b/kubernetes/common/common/templates/_pod.tpl
@@ -53,25 +53,58 @@
{{/*
Generate securityContext for pod
+ required variables: user_id, group_id
+ optional variables: fsgroup_id, runAsNonRoot, seccompProfileType
+ Example in values.yaml
+ securityContext:
+ user_id: 70
+ group_id: 70
+ # fsgroup_id: 70
+ # runAsNonRoot: true
+ # seccompProfileType: "RuntimeDefault"
*/}}
{{- define "common.podSecurityContext" -}}
securityContext:
runAsUser: {{ .Values.securityContext.user_id }}
runAsGroup: {{ .Values.securityContext.group_id }}
- fsGroup: {{ .Values.securityContext.group_id }}
- runAsNonRoot: true
+ fsGroup: {{ default .Values.securityContext.group_id .Values.securityContext.fsgroup_id }}
+ runAsNonRoot: {{ hasKey .Values.securityContext "runAsNonRoot" | ternary .Values.securityContext.runAsNonRoot true }}
seccompProfile:
- type: RuntimeDefault
+ type: {{ default "RuntimeDefault" .Values.securityContext.seccompProfileType }}
{{- end }}
{{/*
- Generate securityContext for container
+ Generate securityContext for container (optional)
+ predefined variables: capabilities.drop
+ optional variables: readOnlyRootFilesystem, privileged, allowPrivilegeEscalation
+ Example in values.yaml
+ containerSecurityContext:
+ capabilities:
+ privileged: false
+ runAsUser: 1337
+ runAsGroup: 1337
+ runAsNonRoot: true
+ readOnlyRootFilesystem: true
+ allowPrivilegeEscalation: false
*/}}
{{- define "common.containerSecurityContext" -}}
securityContext:
+{{- if not .Values.containerSecurityContext }}
readOnlyRootFilesystem: true
privileged: false
allowPrivilegeEscalation: false
+{{- else }}
+ readOnlyRootFilesystem: {{ hasKey .Values.containerSecurityContext "readOnlyRootFilesystem" | ternary .Values.containerSecurityContext.readOnlyRootFilesystem false }}
+ privileged: {{ hasKey .Values.containerSecurityContext "privileged" | ternary .Values.containerSecurityContext.privileged false }}
+ allowPrivilegeEscalation: {{ hasKey .Values.containerSecurityContext "allowPrivilegeEscalation" | ternary .Values.containerSecurityContext.allowPrivilegeEscalation false }}
+ runAsNonRoot: {{ hasKey .Values.containerSecurityContext "runAsNonRoot" | ternary .Values.containerSecurityContext.runAsNonRoot true }}
+{{- if .Values.containerSecurityContext.runAsUser }}
+ runAsUser: {{ .Values.containerSecurityContext.runAsUser }}
+{{- end }}
+{{- if .Values.containerSecurityContext.runAsGroup }}
+ runAsGroup: {{ .Values.containerSecurityContext.runAsGroup }}
+{{ end }}
+{{- end }}
capabilities:
drop:
- ALL
diff --git a/kubernetes/common/common/templates/_serviceMesh.tpl b/kubernetes/common/common/templates/_serviceMesh.tpl
index 505d805..638db8c 100644
--- a/kubernetes/common/common/templates/_serviceMesh.tpl
+++ b/kubernetes/common/common/templates/_serviceMesh.tpl
@@ -78,7 +78,16 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- {{ include "common.containerSecurityContext" . | indent 2 | trim }}
+ securityContext:
+ capabilities:
+ drop:
+ - ALL
+ - CAP_NET_RAW
+ privileged: false
+ readOnlyRootFilesystem: true
+ allowPrivilegeEscalation: false
+ runAsUser: 100
+ runAsGroup: 65533
resources:
limits:
cpu: 100m
diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml
index 6949da7..48de2c0 100644
--- a/kubernetes/common/elasticsearch/Chart.yaml
+++ b/kubernetes/common/elasticsearch/Chart.yaml
@@ -23,10 +23,10 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
- name: master
version: ~13.x-0
repository: 'file://components/master'
diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
index 390228b..baceb1d 100644
--- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
@@ -23,7 +23,7 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../../../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../../../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml
index d49a210..30c925a 100644
--- a/kubernetes/common/elasticsearch/components/data/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml
@@ -23,7 +23,7 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../../../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../../../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml
index 73d5907..e481c7c 100644
--- a/kubernetes/common/elasticsearch/components/master/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml
@@ -22,7 +22,7 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../../../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../../../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 02fc2c0..465364b 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -28,7 +28,7 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml
index a5790a4..7908bfa 100644
--- a/kubernetes/common/logConfiguration/Chart.yaml
+++ b/kubernetes/common/logConfiguration/Chart.yaml
@@ -22,4 +22,4 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index c5bb0aa..41d11a6 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: Chart for MariaDB Galera cluster
name: mariadb-galera
-version: 13.2.0
+version: 13.2.2
keywords:
- mariadb
- mysql
@@ -30,14 +30,14 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: readinessCheck
version: ~13.x-0
- repository: 'file://../readinessCheck'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
- name: serviceAccount
version: ~13.x-0
- repository: 'file://../serviceAccount'
+ repository: '@local'
condition: global.mariadbGalera.enableServiceAccount
\ No newline at end of file
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index f9b4de4..66ce8ab 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -55,7 +55,20 @@
image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
securityContext:
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ - CAP_NET_RAW
+ add:
+ - CHOWN
+ - SYS_CHROOT
+ runAsGroup: {{ .Values.securityContext.group_id }}
+ readOnlyRootFilesystem: false
runAsUser: 0
+ runAsNonRoot: false
+ seccompProfile:
+ type: RuntimeDefault
volumeMounts:
- name: previous-boot
mountPath: /bootstrap
@@ -169,6 +182,7 @@
successThreshold: {{ .Values.startupProbe.successThreshold }}
failureThreshold: {{ .Values.startupProbe.failureThreshold }}
{{- end }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
resources: {{ include "common.resources" . | nindent 12 }}
volumeMounts:
- name: previous-boot
@@ -218,7 +232,7 @@
timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
- {{ include "common.containerSecurityContext" . | indent 10 | trim }}
+ securityContext: {{- toYaml .Values.metrics.securityContext | nindent 12 }}
resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
{{- end }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 47264f9..faab7af 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -217,10 +217,13 @@
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
##
securityContext:
- enabled: true
user_id: 10001
group_id: 10001
+# Old Bitnami Chart does not work without Filesystem access
+containerSecurityContext:
+ readOnlyFileSystem: false
+
## Database credentials for root (admin) user
##
rootUser:
@@ -659,6 +662,19 @@
## - --collect.binlog_size
##
extraFlags: []
+ securityContext:
+ readOnlyRootFilesystem: true
+ privileged: false
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ - CAP_NET_RAW
+ runAsGroup: 10001
+ runAsNonRoot: true
+ runAsUser: 10001
+ seccompProfile:
+ type: RuntimeDefault
## MySQL Prometheus exporter containers' resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
##
diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml
index 0ac3750..d184491 100644
--- a/kubernetes/common/mariadb-init/Chart.yaml
+++ b/kubernetes/common/mariadb-init/Chart.yaml
@@ -23,10 +23,10 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
diff --git a/kubernetes/common/mongodb/templates/backup/cronjob.yaml b/kubernetes/common/mongodb/templates/backup/cronjob.yaml
index 44c297a..b1d0b58 100644
--- a/kubernetes/common/mongodb/templates/backup/cronjob.yaml
+++ b/kubernetes/common/mongodb/templates/backup/cronjob.yaml
@@ -167,7 +167,7 @@
volumes:
- name: empty-dir
emptyDir:
- sizeLimit: {{ .Values.arbiter.emptyDir.sizeLimit }}
+ sizeLimit: {{ .Values.backup.emptyDir.sizeLimit }}
- name: common-scripts
configMap:
name: {{ printf "%s-common-scripts" (include "mongodb.fullname" .) }}
diff --git a/kubernetes/common/mongodb/templates/hidden/statefulset.yaml b/kubernetes/common/mongodb/templates/hidden/statefulset.yaml
index a64002a..493c2b2 100644
--- a/kubernetes/common/mongodb/templates/hidden/statefulset.yaml
+++ b/kubernetes/common/mongodb/templates/hidden/statefulset.yaml
@@ -515,7 +515,7 @@
volumes:
- name: empty-dir
emptyDir:
- sizeLimit: {{ .Values.arbiter.emptyDir.sizeLimit }}
+ sizeLimit: {{ .Values.hidden.emptyDir.sizeLimit }}
- name: common-scripts
configMap:
name: {{ printf "%s-common-scripts" (include "mongodb.fullname" .) }}
diff --git a/kubernetes/common/mongodb/templates/replicaset/statefulset.yaml b/kubernetes/common/mongodb/templates/replicaset/statefulset.yaml
index 089119c..7de00e7 100644
--- a/kubernetes/common/mongodb/templates/replicaset/statefulset.yaml
+++ b/kubernetes/common/mongodb/templates/replicaset/statefulset.yaml
@@ -513,7 +513,7 @@
volumes:
- name: empty-dir
emptyDir:
- sizeLimit: {{ .Values.arbiter.emptyDir.sizeLimit }}
+ sizeLimit: {{ .Values.replicaSet.emptyDir.sizeLimit }}
- name: common-scripts
configMap:
name: {{ printf "%s-common-scripts" (include "mongodb.fullname" .) }}
diff --git a/kubernetes/common/mongodb/templates/standalone/dep-sts.yaml b/kubernetes/common/mongodb/templates/standalone/dep-sts.yaml
index 619533d..817698b 100644
--- a/kubernetes/common/mongodb/templates/standalone/dep-sts.yaml
+++ b/kubernetes/common/mongodb/templates/standalone/dep-sts.yaml
@@ -438,7 +438,7 @@
volumes:
- name: empty-dir
emptyDir:
- sizeLimit: {{ .Values.arbiter.emptyDir.sizeLimit }}
+ sizeLimit: {{ .Values.standalone.emptyDir.sizeLimit }}
- name: common-scripts
configMap:
name: {{ printf "%s-common-scripts" (include "mongodb.fullname" .) }}
diff --git a/kubernetes/common/postgres-init/Chart.yaml b/kubernetes/common/postgres-init/Chart.yaml
index 342854c..4951ed6 100644
--- a/kubernetes/common/postgres-init/Chart.yaml
+++ b/kubernetes/common/postgres-init/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2021 Orange
# Modifications Copyright © 2021 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,16 +17,16 @@
apiVersion: v2
description: Chart for Postgres init job
name: postgres-init
-version: 13.0.2
+version: 13.0.3
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
- name: readinessCheck
version: ~13.x-0
repository: '@local'
diff --git a/kubernetes/common/postgres-init/templates/job.yaml b/kubernetes/common/postgres-init/templates/job.yaml
index cc7d410..a2f7e12 100644
--- a/kubernetes/common/postgres-init/templates/job.yaml
+++ b/kubernetes/common/postgres-init/templates/job.yaml
@@ -39,6 +39,7 @@
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
containers:
- command:
@@ -82,6 +83,7 @@
- mountPath: /config
name: pgconf
resources: {{ include "common.resources" . | nindent 10 }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
{{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -98,6 +100,7 @@
name: {{ include "common.fullname" . }}
- name: pgconf
emptyDir:
+ sizeLimit: 64Mi
medium: Memory
restartPolicy: Never
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
index cede7e0..99be835 100644
--- a/kubernetes/common/postgres-init/values.yaml
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -97,6 +97,10 @@
roles:
- read
+securityContext:
+ user_id: 26
+ group_id: 26
+
readinessCheck:
wait_for:
services:
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index d1fb768..562b69f 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -22,7 +22,7 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index bd8adbf..c913417 100644
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -22,7 +22,7 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
index 4e3eab3..b691c40 100644
--- a/kubernetes/common/serviceAccount/Chart.yaml
+++ b/kubernetes/common/serviceAccount/Chart.yaml
@@ -23,4 +23,4 @@
dependencies:
- name: common
version: ~13.x-0
- repository: 'file://../common'
+ repository: '@local'
diff --git a/kubernetes/common/timescaledb/Chart.yaml b/kubernetes/common/timescaledb/Chart.yaml
index dd92121..8ce4600 100644
--- a/kubernetes/common/timescaledb/Chart.yaml
+++ b/kubernetes/common/timescaledb/Chart.yaml
@@ -22,7 +22,7 @@
appVersion: "1.0"
description: ONAP timescaledb
name: timescaledb
-version: 13.0.0
+version: 13.0.1
dependencies:
- name: common
@@ -33,4 +33,4 @@
repository: '@local'
- name: repositoryGenerator
version: ~13.x-0
- repository: 'file://../repositoryGenerator'
+ repository: '@local'
diff --git a/kubernetes/common/timescaledb/templates/statefulset.yaml b/kubernetes/common/timescaledb/templates/statefulset.yaml
index bee389f..031241d 100644
--- a/kubernetes/common/timescaledb/templates/statefulset.yaml
+++ b/kubernetes/common/timescaledb/templates/statefulset.yaml
@@ -29,11 +29,12 @@
metadata: {{- include "common.templateMetadata" (dict "ignoreHelmChart" true "dot" . ) | nindent 6 }}
spec:
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . ) }}
- {{ include "common.podSecurityContext" . | indent 10 | trim}}
+ {{ include "common.podSecurityContext" . | indent 6 | trim}}
containers:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim}}
ports: {{ include "common.containerPorts" . | nindent 12 }}
livenessProbe:
exec:
@@ -64,10 +65,15 @@
mountPath: /docker-entrypoint-initdb.d
- name: {{ include "common.fullname" . }}
mountPath: /var/lib/postgresql/data
+ - name: var-run
+ mountPath: /var/run/postgresql
volumes:
- name: {{ include "common.fullname" . }}-init
configMap:
name: {{ include "common.fullname" . }}-init
+ - name: var-run
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.varDir.sizeLimit }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
@@ -78,9 +84,9 @@
{{- end }}
{{- with .Values.tolerations }}
tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
volumeClaimTemplates:
- {{ include "common.PVCTemplate" (dict "dot" . "suffix" "data" "persistenceInfos" .Values.persistence "ignoreHelmChart" true) | indent 6 | trim }}
-{{- end }}
+ {{- end }}
diff --git a/kubernetes/common/timescaledb/values.yaml b/kubernetes/common/timescaledb/values.yaml
index 2643f55..35beab7 100644
--- a/kubernetes/common/timescaledb/values.yaml
+++ b/kubernetes/common/timescaledb/values.yaml
@@ -21,9 +21,9 @@
persistence: {}
#################################################################
-# Secrets.
+# Image
##############################################################
-image: timescale/timescaledb:2.5.1-pg14
+image: timescale/timescaledb:2.16.1-pg14
pullPolicy: Always
containerPorts: 5432
@@ -41,11 +41,6 @@
# Uid and gid to run the entrypoint of the container process (uid 70 is postgres user and gid 70 is postgres group)
user_id: 70
group_id: 70
- # capabilities:
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
flavor: small
@@ -114,6 +109,10 @@
pgRootUserName: postgres
pgDatabase: timescaledb
+dirSizes:
+ varDir:
+ sizeLimit: 64Mi
+
secrets:
- uid: root-creds
type: basicAuth
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index ade33b4..83b344b 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -19,19 +19,15 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "NewDelhi"
+appVersion: "Oslo"
description: DCAE Microservices
name: dcaegen2-services
-version: 13.1.0
+version: 15.0.0
dependencies:
- name: common
version: ~13.x-0
repository: '@local'
- - name: dcae-datafile-collector
- version: ~13.x-0
- repository: '@local'
- condition: dcae-datafile-collector.enabled
- name: dcae-datalake-admin-ui
version: ~13.x-0
repository: '@local'
@@ -44,62 +40,22 @@
version: ~13.x-0
repository: '@local'
condition: dcae-datalake-feeder.enabled
- - name: dcae-heartbeat
- version: ~13.x-0
- repository: '@local'
- condition: dcae-heartbeat.enabled
- name: dcae-hv-ves-collector
version: ~13.x-0
repository: '@local'
condition: dcae-hv-ves-collector.enabled
- - name: dcae-kpi-ms
- version: ~13.x-0
- repository: '@local'
- condition: dcae-kpi-ms.enabled
- name: dcae-ms-healthcheck
version: ~13.x-0
repository: '@local'
condition: dcae-ms-healthcheck.enabled
- - name: dcae-pm-mapper
- version: ~13.x-0
- repository: '@local'
- condition: dcae-pm-mapper.enabled
- - name: dcae-pmsh
- version: ~13.x-0
- repository: '@local'
- condition: dcae-pmsh.enabled
- name: dcae-prh
version: ~13.x-0
repository: '@local'
condition: dcae-prh.enabled
- - name: dcae-restconf-collector
- version: ~13.x-0
- repository: '@local'
- condition: dcae-restconf-collector.enabled
- - name: dcae-slice-analysis-ms
- version: ~13.x-0
- repository: '@local'
- condition: dcae-slice-analysis-ms.enabled
- - name: dcae-snmptrap-collector
- version: ~13.x-0
- repository: '@local'
- condition: dcae-snmptrap-collector.enabled
- - name: dcae-son-handler
- version: ~13.x-0
- repository: '@local'
- condition: dcae-son-handler.enabled
- - name: dcae-tcagen2
- version: ~13.x-0
- repository: '@local'
- condition: dcae-tcagen2.enabled
- name: dcae-ves-collector
version: ~13.x-0
repository: '@local'
condition: dcae-ves-collector.enabled
- - name: dcae-ves-mapper
- version: ~13.x-0
- repository: '@local'
- condition: dcae-ves-mapper.enabled
- name: dcae-ves-openapi-manager
version: ~13.x-0
repository: 'file://components/dcae-ves-openapi-manager'
diff --git a/kubernetes/dcaegen2-services/resources/expected-components.json b/kubernetes/dcaegen2-services/resources/expected-components.json
index 7c4c3fb..c91552e 100644
--- a/kubernetes/dcaegen2-services/resources/expected-components.json
+++ b/kubernetes/dcaegen2-services/resources/expected-components.json
@@ -40,7 +40,7 @@
*/}}
{{- $ctx := . -}}
-{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" "dcae-ves-openapi-manager" -}}
+{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-ves-collector" "dcae-ves-openapi-manager" -}}
{{- $enabled := dict "enabled" list -}}
{{- range $components -}}
{{- if index $ctx.Values . "enabled" -}}
diff --git a/kubernetes/dcaegen2-services/values.yaml b/kubernetes/dcaegen2-services/values.yaml
index ba3607f..6efbf36 100644
--- a/kubernetes/dcaegen2-services/values.yaml
+++ b/kubernetes/dcaegen2-services/values.yaml
@@ -28,9 +28,6 @@
# Control deployment of DCAE microservices at ONAP installation time
dcae-ves-openapi-manager:
enabled: true
-dcae-datafile-collector:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
dcae-datalake-admin-ui:
enabled: false
logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
@@ -40,45 +37,15 @@
dcae-datalake-feeder:
enabled: false
logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-heartbeat:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
dcae-hv-ves-collector:
enabled: true
logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-kpi-ms:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
dcae-ms-healthcheck:
enabled: true
logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-pm-mapper:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-pmsh:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
dcae-prh:
enabled: true
logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-restconf-collector:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-slice-analysis-ms:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-snmptrap-collector:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-son-handler:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-tcagen2:
- enabled: true
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
dcae-ves-collector:
enabled: true
logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-ves-mapper:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 48a3b96..cecef8c 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: ONAP multicloud broker
name: multicloud
-version: 13.1.0
+version: 15.0.0
dependencies:
- name: common
@@ -35,26 +35,6 @@
version: ~13.x-0
repository: 'file://components/multicloud-k8s'
condition: multicloud-k8s.enabled
- - name: multicloud-pike
- version: ~13.x-0
- repository: 'file://components/multicloud-pike'
- condition: multicloud-pike.enabled
- - name: multicloud-prometheus
- version: ~13.x-0
- repository: 'file://components/multicloud-prometheus'
- condition: multicloud-prometheus.enabled
- - name: multicloud-starlingx
- version: ~13.x-0
- repository: 'file://components/multicloud-starlingx'
- condition: multicloud-starlingx.enabled
- - name: multicloud-vio
- version: ~13.x-0
- repository: 'file://components/multicloud-vio'
- condition: multicloud-vio.enabled
- - name: multicloud-windriver
- version: ~13.x-0
- repository: 'file://components/multicloud-windriver'
- condition: multicloud-windriver.enabled
- name: serviceAccount
version: ~13.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 033826f..6906390 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -39,27 +39,11 @@
logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
multicloud-k8s:
enabled: true
-multicloud-pike:
- enabled: true
- logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
-multicloud-prometheus:
- enabled: false
-multicloud-starlingx:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
-multicloud-vio:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
-multicloud-windriver:
- enabled: false
- logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
# application configuration
config:
- msbgateway: msb-iag
logstashServiceName: log-ls
logstashPort: 5044
- msbPort: 80
aai:
aaiPort: 80
schemaVersion: v13
@@ -89,28 +73,6 @@
- name: http
port: 9001
nodePort: '91'
- annotations:
- msb.onap.org/service-info: |
- {{ if .Values.global.msbEnabled -}}[
- {
- "serviceName": "multicloud",
- "version": "v0",
- "url": "/api/multicloud/v0",
- "protocol": "REST",
- "port": "{{ .Values.service.internalPort }}",
- "enable_ssl": false,
- "visualRange": "1"
- },
- {
- "serviceName": "multicloud",
- "version": "v1",
- "url": "/api/multicloud/v1",
- "protocol": "REST",
- "port": "{{ .Values.service.internalPort }}",
- "enable_ssl": false,
- "visualRange": "1"
- }
- ]{{ end }}
ingress:
enabled: false
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 3e19cbd..a035097 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -41,10 +41,6 @@
version: ~13.x-0
repository: '@local'
condition: cds.enabled
- - name: cli
- version: ~13.x-0
- repository: '@local'
- condition: cli.enabled
- name: common
version: ~13.x-0
repository: '@local'
@@ -53,33 +49,17 @@
repository: '@local'
condition: cps.enabled
- name: dcaegen2-services
- version: ~13.x-0
+ version: ~15.x-0
repository: '@local'
condition: dcaegen2-services.enabled
- - name: holmes
- version: ~13.x-0
- repository: '@local'
- condition: holmes.enabled
- - name: dmaap
- version: ~13.x-0
- repository: '@local'
- condition: dmaap.enabled
- name: mariadb-galera
version: ~13.x-0
repository: '@local'
condition: mariadb-galera.enabled
- - name: msb
- version: ~13.x-0
- repository: '@local'
- condition: msb.enabled
- name: multicloud
- version: ~13.x-0
+ version: ~15.x-0
repository: '@local'
condition: multicloud.enabled
- - name: nbi
- version: ~13.x-0
- repository: '@local'
- condition: nbi.enabled
- name: policy
version: ~14.x-0
repository: '@local'
@@ -92,10 +72,6 @@
version: ~13.x-0
repository: '@local'
condition: postgres.enabled
- - name: oof
- version: ~13.x-0
- repository: '@local'
- condition: oof.enabled
- name: repository-wrapper
version: ~13.x-0
repository: '@local'
@@ -108,7 +84,7 @@
repository: '@local'
condition: sdc.enabled
- name: sdnc
- version: ~14.x-0
+ version: ~15.x-0
repository: '@local'
condition: sdnc.enabled
- name: so
@@ -123,18 +99,6 @@
version: ~13.x-0
repository: '@local'
condition: uui.enabled
- - name: vfc
- version: ~13.x-0
- repository: '@local'
- condition: vfc.enabled
- - name: vnfsdk
- version: ~13.x-0
- repository: '@local'
- condition: vnfsdk.enabled
- - name: modeling
- version: ~13.x-0
- repository: '@local'
- condition: modeling.enabled
- name: platform
version: ~13.x-0
repository: '@local'
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 468aab8..554bacd 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -61,37 +61,6 @@
readiness:
timeoutSeconds: 30
periodSeconds: 60
-holmes:
- holmes-rule-mgmt:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
- holmes-engine-mgmt:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
-dmaap:
- dmaap-bus-controller:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
- dmaap-dr-prov:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
- mariadb:
- liveness:
- initialDelaySeconds: 180
- periodSeconds: 60
- dmaap-dr-node:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
mariadb-galera:
liveness:
initialDelaySeconds: 30
@@ -101,19 +70,6 @@
initialDelaySeconds: 120
readiness:
initialDelaySeconds: 120
-modeling:
- mariadb-galera:
- liveness:
- initialDelaySeconds: 180
- periodSeconds: 60
-oof:
- oof-has:
- music:
- music-cassandra:
- liveness:
- periodSeconds: 120
- readiness:
- periodSeconds: 60
sdc:
sdc-fe:
liveness:
@@ -159,11 +115,6 @@
initialDelaySeconds: 60
readiness:
initialDelaySeconds: 60
- dmaap-listener:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
mariadb-galera:
liveness:
initialDelaySeconds: 180
@@ -190,8 +141,3 @@
initialDelaySeconds: 120
readiness:
initialDelaySeconds: 120
-vfc:
- mariadb-galera:
- liveness:
- initialDelaySeconds: 180
- periodSeconds: 60
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index 4c1a418..159c800 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -74,36 +74,16 @@
enabled: true
cds:
enabled: true
-cli:
- enabled: false
cps:
enabled: false
dcaegen2-services:
enabled: false
-holmes:
- enabled: false
-dmaap:
- enabled: true
- message-router:
- enabled: true
- dmaap-dr-prov:
- enabled: false
- dmaap-dr-node:
- enabled: false
-oof:
- enabled: true
mariadb-galera:
enabled: true
msb:
enabled: true
multicloud:
enabled: false
-nbi:
- enabled: true
- config:
- # openstack configuration
- openStackRegion: "Yolo"
- openStackVNFTenantId: "1234"
policy:
enabled: true
portal-ng:
@@ -117,21 +97,16 @@
enabled: true
sdnc:
enabled: false
-
replicaCount: 1
-
mysql:
replicaCount: 1
so:
enabled: true
-
replicaCount: 1
-
liveness:
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: false
-
# so server configuration
config:
# message router configuration
@@ -149,9 +124,3 @@
enabled: false
uui:
enabled: true
-vfc:
- enabled: false
-vnfsdk:
- enabled: false
-modeling:
- enabled: false
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml
index 7e73456..b4b7741 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml
@@ -68,70 +68,30 @@
enabled: true
cds:
enabled: true
-cli:
- enabled: false
cps:
enabled: true
dcaegen2-services:
enabled: true
- dcae-datafile-collector:
- enabled: false
dcae-datalake-admin-ui:
enabled: true
dcae-datalake-des:
enabled: true
dcae-datalake-feeder:
enabled: true
- dcae-heartbeat:
- enabled: false
dcae-hv-ves-collector:
enabled: true
- dcae-kpi-ms:
- enabled: false
dcae-ms-healthcheck:
enabled: true
- dcae-pm-mapper:
- enabled: false
- dcae-pmsh:
- enabled: false
dcae-prh:
enabled: true
- dcae-restconf-collector:
- enabled: false
- dcae-slice-analysis-ms:
- enabled: false
- dcae-snmptrap-collector:
- enabled: false
- dcae-son-handler:
- enabled: false
- dcae-tcagen2:
- enabled: false
dcae-ves-collector:
enabled: true
applicationConfig:
auth.method: "noAuth"
- dcae-ves-mapper:
- enabled: false
dcae-ves-openapi-manager:
enabled: true
-holmes:
- enabled: false
-dmaap:
- enabled: true
- message-router:
- enabled: false
- dmaap-dr-prov:
- enabled: true
- dmaap-dr-node:
- enabled: true
-oof:
- enabled: false
-msb:
- enabled: false
multicloud:
enabled: true
-nbi:
- enabled: false
platform:
enabled: true
cmpv2-cert-service:
@@ -150,8 +110,6 @@
enabled: true
dgbuilder:
enabled: true
- dmaap-listener:
- enabled: false
ueb-listener:
enabled: true
sdnc-ansible-server:
@@ -166,11 +124,5 @@
enabled: true
uui:
enabled: true
-vfc:
- enabled: false
-vnfsdk:
- enabled: false
-modeling:
- enabled: false
a1policymanagement:
enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index f3c3dd2..c4b5e09 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -69,72 +69,30 @@
enabled: true
cds:
enabled: true
-cli:
- enabled: false
cps:
enabled: true
-dcaegen2:
- enabled: true
dcaegen2-services:
enabled: true
- dcae-datafile-collector:
- enabled: false
dcae-datalake-admin-ui:
enabled: true
dcae-datalake-des:
enabled: true
dcae-datalake-feeder:
enabled: true
- dcae-heartbeat:
- enabled: false
dcae-hv-ves-collector:
enabled: true
- dcae-kpi-ms:
- enabled: false
dcae-ms-healthcheck:
enabled: true
- dcae-pm-mapper:
- enabled: false
- dcae-pmsh:
- enabled: false
dcae-prh:
enabled: true
- dcae-restconf-collector:
- enabled: false
- dcae-slice-analysis-ms:
- enabled: false
- dcae-snmptrap-collector:
- enabled: false
- dcae-son-handler:
- enabled: false
- dcae-tcagen2:
- enabled: false
dcae-ves-collector:
enabled: true
applicationConfig:
auth.method: "noAuth"
- dcae-ves-mapper:
- enabled: false
dcae-ves-openapi-manager:
enabled: true
-holmes:
- enabled: true
-dmaap:
- enabled: true
- message-router:
- enabled: false
- dmaap-dr-prov:
- enabled: true
- dmaap-dr-node:
- enabled: true
-oof:
- enabled: false
-msb:
- enabled: false
multicloud:
enabled: true
-nbi:
- enabled: false
platform:
enabled: true
cmpv2-cert-service:
@@ -153,8 +111,6 @@
enabled: true
dgbuilder:
enabled: true
- dmaap-listener:
- enabled: false
ueb-listener:
enabled: true
sdnc-ansible-server:
@@ -169,11 +125,5 @@
enabled: true
uui:
enabled: true
-vfc:
- enabled: false
-vnfsdk:
- enabled: false
-modeling:
- enabled: false
a1policymanagement:
enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index f14156c..c90614b 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -45,72 +45,32 @@
enabled: true
cds:
enabled: true
-cli:
- enabled: false
cps:
enabled: true
-dcaegen2:
- enabled: true
dcaegen2-services:
enabled: true
- dcae-datafile-collector:
- enabled: false
dcae-datalake-admin-ui:
enabled: true
dcae-datalake-des:
enabled: true
dcae-datalake-feeder:
enabled: true
- dcae-heartbeat:
- enabled: false
dcae-hv-ves-collector:
enabled: true
- dcae-kpi-ms:
- enabled: false
dcae-ms-healthcheck:
enabled: true
- dcae-pm-mapper:
- enabled: false
- dcae-pmsh:
- enabled: false
dcae-prh:
enabled: true
dcae-restconf-collector:
enabled: false
- dcae-slice-analysis-ms:
- enabled: false
- dcae-snmptrap-collector:
- enabled: false
- dcae-son-handler:
- enabled: false
- dcae-tcagen2:
- enabled: false
dcae-ves-collector:
enabled: true
applicationConfig:
auth.method: "noAuth"
- dcae-ves-mapper:
- enabled: false
dcae-ves-openapi-manager:
enabled: true
-holmes:
- enabled: true
-dmaap:
- enabled: true
- message-router:
- enabled: true
- dmaap-dr-prov:
- enabled: true
- dmaap-dr-node:
- enabled: true
-oof:
- enabled: false
-msb:
- enabled: false
multicloud:
enabled: true
-nbi:
- enabled: false
platform:
enabled: true
cmpv2-cert-service:
@@ -129,8 +89,6 @@
enabled: true
dgbuilder:
enabled: true
- dmaap-listener:
- enabled: false
ueb-listener:
enabled: true
sdnc-ansible-server:
@@ -145,12 +103,6 @@
enabled: true
uui:
enabled: true
-vfc:
- enabled: false
-vnfsdk:
- enabled: false
-modeling:
- enabled: false
a1policymanagement:
enabled: true
55,15 39%
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 5cfb126..444d904 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -31,68 +31,28 @@
enabled: true
cds:
enabled: true
-cli:
- enabled: false
cps:
enabled: true
dcaegen2-services:
enabled: true
- dcae-datafile-collector:
- enabled: false
dcae-datalake-admin-ui:
enabled: true
dcae-datalake-des:
enabled: true
dcae-datalake-feeder:
enabled: true
- dcae-heartbeat:
- enabled: false
dcae-hv-ves-collector:
enabled: true
- dcae-kpi-ms:
- enabled: false
dcae-ms-healthcheck:
enabled: true
- dcae-pm-mapper:
- enabled: false
- dcae-pmsh:
- enabled: false
dcae-prh:
enabled: true
- dcae-restconf-collector:
- enabled: false
- dcae-slice-analysis-ms:
- enabled: false
- dcae-snmptrap-collector:
- enabled: false
- dcae-son-handler:
- enabled: false
- dcae-tcagen2:
- enabled: false
dcae-ves-collector:
enabled: true
- dcae-ves-mapper:
- enabled: false
dcae-ves-openapi-manager:
enabled: true
-holmes:
- enabled: false
-dmaap:
- enabled: true
- message-router:
- enabled: false
- dmaap-dr-prov:
- enabled: true
- dmaap-dr-node:
- enabled: true
-oof:
- enabled: false
-msb:
- enabled: false
multicloud:
enabled: true
-nbi:
- enabled: false
policy:
enabled: true
portal-ng:
@@ -107,8 +67,6 @@
enabled: true
dgbuilder:
enabled: true
- dmaap-listener:
- enabled: false
ueb-listener:
enabled: true
sdnc-ansible-server:
@@ -123,12 +81,6 @@
enabled: true
uui:
enabled: true
-vfc:
- enabled: false
-vnfsdk:
- enabled: false
-modeling:
- enabled: false
platform:
enabled: true
a1policymanagement:
diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml
index 14748dd..5ce3a97 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -25,20 +25,6 @@
enabled: true
dcaegen2-services:
enabled: true
-holmes:
- enabled: true
-dmaap:
- enabled: true
- message-router:
- enabled: true
- dmaap-dr-prov:
- enabled: false
- dmaap-dr-node:
- enabled: false
-oof:
- enabled: true
-msb:
- enabled: true
policy:
enabled: true
portal-ng:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index dc5da35..6877e33 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -63,32 +63,14 @@
cassandra:
enabled: true
replicaCount: 3
-cli:
- enabled: false
cps:
enabled: false
dcaegen2-services:
enabled: false
-dmaap:
- enabled: true
- message-router:
- enabled: true
- dmaap-dr-prov:
- enabled: true
- dmaap-dr-node:
- enabled: true
-holmes:
- enabled: false
mariadb-galera:
enabled: true
-msb:
- enabled: false
multicloud:
enabled: false
-nbi:
- enabled: false
-oof:
- enabled: false
policy:
enabled: false
portal-ng:
@@ -130,10 +112,5 @@
enabled: true
uui:
enabled: false
-vfc:
- enabled: false
-vnfsdk:
- enabled: false
cds:
enabled: true
-
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 663712c..6ca0e26 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -97,7 +97,6 @@
mariadbImage: bitnami/mariadb:10.5.8
# mongodb server image
-
mongodbImage: percona/percona-server-mongodb:7.0.5-3
# nginx server image
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index ca839f0..ee6dabc 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -2,6 +2,7 @@
# Modifications Copyright © 2018, 2020 AT&T
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021-2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@
apiVersion: v2
description: ONAP Policy
name: policy
-version: 14.0.1
+version: 14.0.4
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index c8a2862..4ec4725 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -2,7 +2,7 @@
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
-# Modification (C) 2023 Deutsche Telekom. All rights reserved.
+# Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
apiVersion: v2
description: ONAP Policy APEX PDP
name: policy-apex-pdp
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-apex-pdp/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/deployment.yaml
index de3e6d1..3b25dc5 100755
--- a/kubernetes/policy/components/policy-apex-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/templates/deployment.yaml
@@ -3,7 +3,7 @@
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright (C) 2020 AT&T Intellectual Property.
# Modifications Copyright © 2022 Nordix Foundation
-# Modification (C) 2023 Deutsche Telekom. All rights reserved.
+# Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command: ["/bin/sh", "-cx"]
args:
@@ -62,8 +63,10 @@
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: [ "/bin/sh", "-cx" ]
@@ -104,7 +107,8 @@
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: policy-logs
- emptyDir: {}
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
- name: apexconfig-input
configMap:
name: {{ include "common.fullname" . }}-configmap
@@ -112,4 +116,5 @@
- name: apexconfig
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/kafkauser.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/kafkauser.yaml
index 4259381..6fc37c3 100644
--- a/kubernetes/policy/components/policy-apex-pdp/templates/kafkauser.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/templates/kafkauser.yaml
@@ -14,4 +14,3 @@
# limitations under the License.
*/}}
{{ include "common.kafkauser" . }}
-
diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 6070bb0..0c83a55 100755
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -2,7 +2,7 @@
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
# Modifications Copyright © 2022 Nordix Foundation
-# Modification (C) 2023 Deutsche Telekom. All rights reserved.
+# Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,12 +114,20 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
#Pods Service Account
serviceAccount:
nameOverride: policy-apex-pdp
roles:
- read
+dirSizes:
+ logDir:
+ sizeLimit: 500Mi
+
metrics:
serviceMonitor:
# Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
index 32c22cb..ef0b5ea 100755
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -2,7 +2,7 @@
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
-# Modification (C) 2023 Deutsche Telekom. All rights reserved.
+# Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
apiVersion: v2
description: ONAP Policy Design API
name: policy-api
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-api/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-api/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-api/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-api/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-api/templates/configmap.yaml b/kubernetes/policy/components/policy-api/templates/configmap.yaml
index 9ab25fe..6bb96fc 100755
--- a/kubernetes/policy/components/policy-api/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-api/templates/configmap.yaml
@@ -37,4 +37,4 @@
{{- end }}
{{- end }}
data:
-{{ tpl (.Files.Glob "resources/config/*.{yaml,xml}").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*.{yaml,xml}").AsConfig . | indent 2 }}
diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml
index 8de035e..2f135fa 100755
--- a/kubernetes/policy/components/policy-api/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml
@@ -7,6 +7,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- /app/ready.py
@@ -25,6 +26,7 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
name: {{ include "common.name" . }}-readiness
resources:
limits:
@@ -54,9 +56,11 @@
name: apiconfig-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/api/bin/policy-api.sh"]
@@ -85,6 +89,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.readiness.timeout }}
volumeMounts:
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/api/etc/logback.xml
+ subPath: logback.xml
+ name: apiconfig-processed
- mountPath: /opt/app/policy/api/etc/mounted
name: apiconfig-processed
resources: {{ include "common.resources" . | nindent 12 }}
@@ -105,4 +117,11 @@
- name: apiconfig-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 70c06cc..9193366 100755
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
-# Modification (C) 2023 Deutsche Telekom. All rights reserved.
+# Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@
# probe configuration parameters
liveness:
- initialDelaySeconds: 60
+ initialDelaySeconds: 120
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
@@ -89,7 +89,7 @@
api: /policy/api/v1/healthcheck
successThreshold: 1
failureThreshold: 3
- timeout: 60
+ timeout: 120
service:
type: ClusterIP
@@ -125,6 +125,16 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: policy-api
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
index e35dd3d..a9d27d6 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2022-2024 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
apiVersion: v2
description: ONAP Policy Clamp A1PMS Participant
name: policy-clamp-ac-a1pms-ppnt
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
index 31aa1b7..5bfa825 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
@@ -81,5 +81,3 @@
context-path: /onap/policy/clamp/acm/a1pmsparticipant
ssl:
enabled: false
-
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml
index d34da14..b9eb83b 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2022-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- sh
@@ -50,9 +52,11 @@
name: ac-a1pms-ppnt-config-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/a1pms-participant.sh"]
@@ -75,6 +79,14 @@
volumeMounts:
- mountPath: /opt/app/policy/clamp/etc/mounted
name: ac-a1pms-ppnt-config-processed
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/clamp/etc/logback.xml
+ subPath: logback.xml
+ name: ac-a1pms-ppnt-config-processed
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -93,4 +105,11 @@
- name: ac-a1pms-ppnt-config-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/service.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/service.yaml
index 19f522a..66aadf1 100644
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/service.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/templates/service.yaml
@@ -1,21 +1,21 @@
-{{/*
-# ============LICENSE_START=======================================================
-# Copyright (C) 2022 Nordix Foundation. All rights reserved.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-*/}}
-
-{{ include "common.service" . }}
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022 Nordix Foundation. All rights reserved.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+{{ include "common.service" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index 6bde39d..a23e732 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2022-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -115,6 +116,17 @@
cpu: "1"
memory: "2Gi"
unlimited: {}
+
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
index faa7014..979aa4f 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2022, 2024 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop Http Participant
name: policy-clamp-ac-http-ppnt
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
@@ -31,4 +32,3 @@
- name: serviceAccount
version: ~13.x-0
repository: '@local'
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
index a04c37f..d447360 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
@@ -80,4 +80,3 @@
context-path: /onap/httpparticipant
ssl:
enabled: false
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
index e502c1a..dd7db7a 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- sh
@@ -50,9 +52,11 @@
name: ac-http-ppnt-config-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/http-participant.sh"]
@@ -75,6 +79,14 @@
volumeMounts:
- mountPath: /opt/app/policy/clamp/etc/mounted
name: ac-http-ppnt-config-processed
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/clamp/etc/logback.xml
+ subPath: logback.xml
+ name: ac-http-ppnt-config-processed
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -93,4 +105,11 @@
- name: ac-http-ppnt-config-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/service.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/service.yaml
index e676ff1..be2449f 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/service.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/service.yaml
@@ -1,21 +1,21 @@
-{{/*
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation. All rights reserved.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-*/}}
-
-{{ include "common.service" . }}
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+{{ include "common.service" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index 3ef8d92..8593a3d 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -106,6 +107,17 @@
cpu: "1"
memory: "2Gi"
unlimited: {}
+
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
index aa6d08a..5a1cb6e 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021-2022, 2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop K8s Participant
name: policy-clamp-ac-k8s-ppnt
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
index 8a6cf83..efd5a6c 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
@@ -33,4 +33,4 @@
{{ tpl (.Files.Glob "resources/config/KubernetesParticipantParameters.yaml").AsConfig . | indent 2 }}
{{ toYaml .Values.repoList | indent 4 }}
{{- end }}
-{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
index cfc2fc7..a97ab22 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- sh
@@ -50,9 +52,11 @@
name: ac-k8s-ppnt-config-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/kubernetes-participant.sh"]
@@ -75,6 +79,14 @@
volumeMounts:
- mountPath: /opt/app/policy/clamp/etc/mounted
name: ac-k8s-ppnt-config-processed
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/clamp/etc/logback.xml
+ subPath: logback.xml
+ name: ac-k8s-ppnt-config-processed
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -93,4 +105,11 @@
- name: ac-k8s-ppnt-config-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
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 2439223..02a6292 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
@@ -36,4 +36,3 @@
- kind: ServiceAccount
name: {{ include "common.fullname" (dict "suffix" "create" "dot" . )}}
namespace: {{ include "common.namespace" . }}
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index d34d0e0..5e43b94 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -108,6 +109,16 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
@@ -145,4 +156,3 @@
- name: *acRuntimeTopic
type: topic
operations: [Read, Write]
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
index 44c80ff..863d079 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2023-2024 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
apiVersion: v2
description: ONAP Policy Clamp Kserve Participant
name: policy-clamp-ac-kserve-ppnt
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml
index 89cf949..6613235 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml
@@ -96,5 +96,3 @@
context-path: /onap/policy/clamp/acm/kserveparticipant
ssl:
enabled: false
-
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml
index 8574979..3d1f4f8 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- sh
@@ -50,9 +52,11 @@
name: ac-kserve-ppnt-config-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/kserve-participant.sh"]
@@ -75,6 +79,14 @@
volumeMounts:
- mountPath: /opt/app/policy/clamp/etc/mounted
name: ac-kserve-ppnt-config-processed
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/clamp/etc/logback.xml
+ subPath: logback.xml
+ name: ac-kserve-ppnt-config-processed
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -93,4 +105,11 @@
- name: ac-kserve-ppnt-config-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/kafkauser.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/kafkauser.yaml
index b7e7364..6fc37c3 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/kafkauser.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/kafkauser.yaml
@@ -1,16 +1,16 @@
-{{/*
-# Copyright © 2023 Nordix Foundation
-#
-# 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.
-*/}}
-{{ include "common.kafkauser" . }}
+{{/*
+# Copyright © 2023 Nordix Foundation
+#
+# 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.
+*/}}
+{{ include "common.kafkauser" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/service.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/service.yaml
index ac5ee0b..073ffe9 100644
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/service.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/templates/service.yaml
@@ -1,38 +1,38 @@
-{{/*
-# ============LICENSE_START=======================================================
-# Copyright (C) 2023 Nordix Foundation. All rights reserved.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-*/}}
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
- name: {{ include "common.namespace" . }}-policy-clamp-ac-kserve-ppnt-binding
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: cluster-admin
-subjects:
- - kind: ServiceAccount
- name: {{ include "common.fullname" (dict "suffix" "create" "dot" . )}}
- namespace: {{ include "common.namespace" . }}
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2023 Nordix Foundation. All rights reserved.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ name: {{ include "common.namespace" . }}-policy-clamp-ac-kserve-ppnt-binding
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: cluster-admin
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "common.fullname" (dict "suffix" "create" "dot" . )}}
+ namespace: {{ include "common.namespace" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
index 63ab8ad..6f9868b 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -106,6 +107,17 @@
cpu: "1"
memory: "1.4Gi"
unlimited: {}
+
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
index f860393..4460c18 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2022, 2024 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop Policy Participant
name: policy-clamp-ac-pf-ppnt
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
index 1cd4ba3..729a455 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
@@ -98,4 +98,3 @@
context-path: /onap/policyparticipant
ssl:
enabled: false
-
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
index 9026309..c29dca9 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- sh
@@ -58,9 +60,11 @@
name: ac-pf-ppnt-config-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/policy-participant.sh"]
@@ -83,6 +87,14 @@
volumeMounts:
- mountPath: /opt/app/policy/clamp/etc/mounted
name: ac-pf-ppnt-config-processed
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/clamp/etc/logback.xml
+ subPath: logback.xml
+ name: ac-pf-ppnt-config-processed
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -101,4 +113,11 @@
- name: ac-pf-ppnt-config-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/service.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/service.yaml
index e676ff1..be2449f 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/service.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/service.yaml
@@ -1,21 +1,21 @@
-{{/*
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation. All rights reserved.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-*/}}
-
-{{ include "common.service" . }}
+{{/*
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+*/}}
+
+{{ include "common.service" . }}
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index 2112f25..97bebd0 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -127,6 +128,17 @@
cpu: "1"
memory: "2Gi"
unlimited: {}
+
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
index bdd6c99..0dd1f34 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2021, 2024 Nordix Foundation. All rights reserved.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021-2022 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop Runtime
name: policy-clamp-runtime-acm
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
@@ -33,4 +34,3 @@
- name: serviceAccount
version: ~13.x-0
repository: '@local'
-
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index b0ea909..462f2e5 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2023 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- /app/ready.py
@@ -41,6 +43,7 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-galera-config-readiness
resources:
limits:
@@ -75,9 +78,11 @@
name: ac-runtime-config-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/clamp/bin/acm-runtime.sh"]
@@ -98,6 +103,14 @@
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
volumeMounts:
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/clamp/etc/logback.xml
+ subPath: logback.xml
+ name: ac-runtime-config-processed
- mountPath: /opt/app/policy/clamp/etc/mounted
name: ac-runtime-config-processed
resources: {{ include "common.resources" . | nindent 12 }}
@@ -111,6 +124,12 @@
{{- end }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
- name: ac-runtime-config
configMap:
name: {{ include "common.fullname" . }}-configmap
@@ -118,4 +137,5 @@
- name: ac-runtime-config-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index b2389b9..b030f94 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021-2024 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -96,7 +97,7 @@
# probe configuration parameters
liveness:
- initialDelaySeconds: 60
+ initialDelaySeconds: 120
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
@@ -141,6 +142,16 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
@@ -153,4 +164,4 @@
customNaming:
toscaElementName: org.onap.policy.clamp.acm.AutomationCompositionElement
- toscaCompositionName: org.onap.policy.clamp.acm.AutomationComposition
\ No newline at end of file
+ toscaCompositionName: org.onap.policy.clamp.acm.AutomationComposition
diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
index 3de47d0..b2d1cde 100755
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
apiVersion: v2
description: ONAP Policy Distribution
name: policy-distribution
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-distribution/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-distribution/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-distribution/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-distribution/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-distribution/templates/deployment.yaml b/kubernetes/policy/components/policy-distribution/templates/deployment.yaml
index 62a3bfc..fe08271 100755
--- a/kubernetes/policy/components/policy-distribution/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-distribution/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2020 AT&T Intellectual Property.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- sh
@@ -57,9 +59,11 @@
name: distributionconfig
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
@@ -86,6 +90,14 @@
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
volumeMounts:
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/distribution/etc/logback.xml
+ subPath: logback.xml
+ name: distributionconfig
- mountPath: /opt/app/policy/distribution/etc/mounted
name: distributionconfig
resources: {{ include "common.resources" . | nindent 12 }}
@@ -106,4 +118,11 @@
- name: distributionconfig
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 042cbd2..f93dffe 100755
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
# Modifications Copyright (C) 2023 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -141,6 +142,16 @@
memory: "1Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: policy-distribution
diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
index 63c4984..710a04f 100755
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -2,6 +2,7 @@
# Modifications Copyright © 2018, 2020 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@
apiVersion: v2
description: ONAP Drools Policy Engine (PDP-D)
name: policy-drools-pdp
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-drools-pdp/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/service.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/service.yaml
index c7322b1..3f45b2f 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/service.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/service.yaml
@@ -16,4 +16,3 @@
*/}}
{{ include "common.service" . }}
-
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index ba0e2d1..3f25d96 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -1,6 +1,7 @@
{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2020, 2022 AT&T Intellectual Property
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -25,6 +26,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- /app/ready.py
@@ -39,6 +41,7 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-db-readiness
resources:
limits:
@@ -69,6 +72,7 @@
value: {{ .Values.config.app.listener.policyPdpPapTopic }}
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-readiness
resources:
limits:
@@ -80,6 +84,7 @@
{{- end }}
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["sh","-c"]
@@ -107,6 +112,14 @@
- name: SQL_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 12 }}
volumeMounts:
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/etc/profile.d/base.conf
+ subPath: base.conf
+ name: drools-config
{{- range $path, $bytes := .Files.Glob "resources/secrets/*" }}
- mountPath: /tmp/policy-install/config/{{ base $path }}
name: drools-secret
@@ -128,6 +141,12 @@
{{- end }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
- name: drools-config
configMap:
name: {{ include "common.fullname" . }}-configmap
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index e35c08a..b1a26fb 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs
# Copyright © 2017, 2021 Bell Canada
# Modifications Copyright © 2018-2022 AT&T Intellectual Property
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -171,6 +172,16 @@
memory: "1.6Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: policy-drools-pdp
diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
index 8d04647..ae8eebe 100755
--- a/kubernetes/policy/components/policy-nexus/Chart.yaml
+++ b/kubernetes/policy/components/policy-nexus/Chart.yaml
@@ -2,6 +2,7 @@
# Modifications Copyright © 2018-2020 AT&T
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@
apiVersion: v2
description: ONAP Policy Nexus
name: policy-nexus
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-nexus/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-nexus/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-nexus/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-nexus/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml
index 3d03338..fe183cf 100755
--- a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2020 AT&T Intellectual Property
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,16 +25,19 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command: ["sh", "-c", "chown -R 200:200 /share"]
image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-init
volumeMounts:
- mountPath: /share
name: nexus-data
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 12 }}
diff --git a/kubernetes/policy/components/policy-nexus/templates/service.yaml b/kubernetes/policy/components/policy-nexus/templates/service.yaml
index 6aee4ca..8d13879 100755
--- a/kubernetes/policy/components/policy-nexus/templates/service.yaml
+++ b/kubernetes/policy/components/policy-nexus/templates/service.yaml
@@ -15,4 +15,4 @@
# limitations under the License.
*/}}
-{{ include "common.service" . }}
\ No newline at end of file
+{{ include "common.service" . }}
diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml
index f10d55d..b82785f 100755
--- a/kubernetes/policy/components/policy-nexus/values.yaml
+++ b/kubernetes/policy/components/policy-nexus/values.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2020 AT&T Intellectual Property
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -97,6 +98,10 @@
memory: "1Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
#Pods Service Account
serviceAccount:
nameOverride: policy-nexus
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index 0634118..1fd621b 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -3,6 +3,7 @@
# Modified Copyright (C) 2020 AT&T Intellectual Property.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@
apiVersion: v2
description: ONAP Policy Administration (PAP)
name: policy-pap
-version: 14.0.0
+version: 14.0.1
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-pap/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-pap/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-pap/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
index 9ca8b84..8f00eb0 100755
--- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
@@ -2,6 +2,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2020 AT&T Intellectual Property.
# Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -28,6 +29,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- /app/ready.py
@@ -45,6 +47,7 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-db-readiness
resources:
limits:
@@ -87,9 +90,11 @@
name: papconfig-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -121,8 +126,16 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.readiness.timeout }}
volumeMounts:
- - mountPath: /opt/app/policy/pap/etc/mounted
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/pap/etc/logback.xml
+ subPath: logback.xml
name: papconfig-processed
+ - name: papconfig-processed
+ mountPath: /opt/app/policy/pap/etc/mounted
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -134,6 +147,12 @@
{{- end }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
- name: papconfig
configMap:
name: {{ include "common.fullname" . }}-configmap
@@ -141,4 +160,5 @@
- name: papconfig-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 5f6fb21..d7384a5 100755
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -3,6 +3,7 @@
# Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
# Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
# Modifications Copyright © 2022 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -159,6 +160,16 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+
#Pods Service Account
serviceAccount:
nameOverride: policy-pap
@@ -224,4 +235,3 @@
type: topic
patternType: prefix
operations: [Create, Describe, Read, Write]
-
diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
index a46d612..8bb17a5 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021, 2024 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
apiVersion: v2
description: ONAP Policy XACML PDP (PDP-X)
name: policy-xacml-pdp
-version: 14.0.0
+version: 14.0.2
dependencies:
- name: common
diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/authorizationpolicy.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/authorizationpolicy.yaml
index 7158c02..5a9baa8 100644
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/authorizationpolicy.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/authorizationpolicy.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
*/}}
-{{ include "common.authorizationPolicy" . }}
\ No newline at end of file
+{{ include "common.authorizationPolicy" . }}
diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
index cda1aa4..ce11fe7 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -1,6 +1,7 @@
{{/*
# ============LICENSE_START=======================================================
# Copyright (C) 2020 AT&T Intellectual Property.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
initContainers:
- command:
- /app/ready.py
@@ -41,6 +43,7 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-readiness
resources:
limits:
@@ -87,9 +90,11 @@
name: pdpxconfig-processed
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
name: {{ include "common.name" . }}-update-config
containers:
- name: {{ include "common.name" . }}
+ {{ include "common.containerSecurityContext" . | indent 10 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/pdpx/bin/policy-pdpx.sh"]
@@ -110,6 +115,44 @@
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
volumeMounts:
+ - name: policy-guard
+ mountPath: /opt/app/policy/pdpx/apps/guard
+ - name: pdpxconfig-processed
+ mountPath: /opt/app/policy/pdpx/apps/guard/xacml.properties
+ subPath: xacml.properties
+ - name: policy-match
+ mountPath: /opt/app/policy/pdpx/apps/match
+ - name: pdpxconfig-processed
+ mountPath: /opt/app/policy/pdpx/apps/match/xacml.properties
+ subPath: xacml.properties
+ - name: policy-monitoring
+ mountPath: /opt/app/policy/pdpx/apps/monitoring
+ - name: pdpxconfig-processed
+ mountPath: /opt/app/policy/pdpx/apps/monitoring/xacml.properties
+ subPath: xacml.properties
+ - name: policy-naming
+ mountPath: /opt/app/policy/pdpx/apps/naming
+ - name: pdpxconfig-processed
+ mountPath: /opt/app/policy/pdpx/apps/naming/xacml.properties
+ subPath: xacml.properties
+ - name: policy-native
+ mountPath: /opt/app/policy/pdpx/apps/native
+ - name: pdpxconfig-processed
+ mountPath: /opt/app/policy/pdpx/apps/native/xacml.properties
+ subPath: xacml.properties
+ - name: policy-optimization
+ mountPath: /opt/app/policy/pdpx/apps/optimization
+ - name: pdpxconfig-processed
+ mountPath: /opt/app/policy/pdpx/apps/optimization/xacml.properties
+ subPath: xacml.properties
+ - name: logs
+ mountPath: /var/log/onap
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - mountPath: /opt/app/policy/pdpx/etc/logback.xml
+ subPath: logback.xml
+ name: pdpxconfig-processed
- mountPath: /opt/app/policy/pdpx/etc/mounted
name: pdpxconfig-processed
resources: {{ include "common.resources" . | nindent 12 }}
@@ -123,6 +166,30 @@
{{- end }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
+ - name: policy-guard
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+ - name: policy-match
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+ - name: policy-monitoring
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+ - name: policy-naming
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+ - name: policy-native
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+ - name: policy-optimization
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+ - name: empty-dir
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+ - name: logs
+ emptyDir:
+ sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
- name: pdpxconfig
configMap:
name: {{ include "common.fullname" . }}-configmap
@@ -130,4 +197,5 @@
- name: pdpxconfig-processed
emptyDir:
medium: Memory
+ sizeLimit: 64Mi
{{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml
index 3e76c2b..6dabd95 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml
@@ -18,4 +18,4 @@
# ============LICENSE_END=========================================================
*/}}
-{{ include "common.service" . }}
\ No newline at end of file
+{{ include "common.service" . }}
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index ae216a2..18ddfdf 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2024 Deutsche Telekom
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -147,6 +148,18 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 102
+
+dirSizes:
+ emptyDir:
+ sizeLimit: 1Gi
+ logDir:
+ sizeLimit: 500Mi
+ policyDir:
+ sizeLimit: 100Mi
+
#Pods Service Account
serviceAccount:
nameOverride: *componentName
@@ -194,5 +207,3 @@
type: topic
patternType: prefix
operations: [ Create, Describe, Read, Write ]
-
-
diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index 3880d23..2c0ee78 100755
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -2,6 +2,7 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2020 AT&T Intellectual Property
# Modifications Copyright (C) 2022 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -33,6 +34,7 @@
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}-galera-init
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
initContainers:
{{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_mariadb ) | indent 6 | trim }}
@@ -40,6 +42,7 @@
- name: {{ include "common.name" . }}-galera-config
image: {{ include "repositoryGenerator.image.mariadb" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
volumeMounts:
- mountPath: /dbcmd-config/db.sh
name: {{ include "common.fullname" . }}-config
@@ -48,7 +51,7 @@
- /bin/sh
- -cx
- |
- {{- if include "common.onServiceMesh" . }}
+ {{- if include "common.requireSidecarKiller" . }}
echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
/dbcmd-config/db.sh
env:
@@ -61,7 +64,7 @@
- name: MYSQL_PORT
value: "{{ index .Values "mariadb-galera" "service" "internalPort" }}"
resources: {{ include "common.resources" . | nindent 10 }}
- {{- if (include "common.onServiceMesh" .) }}
+ {{- if (include "common.requireSidecarKiller" .) }}
- name: policy-service-mesh-wait-for-job-container
image: {{ include "repositoryGenerator.image.quitQuit" . }}
imagePullPolicy: Always
@@ -77,6 +80,14 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
+ resources:
+ limits:
+ cpu: 100m
+ memory: 500Mi
+ requests:
+ cpu: 10m
+ memory: 10Mi
{{- end }}
restartPolicy: Never
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
@@ -108,6 +119,7 @@
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}-pg-init
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
initContainers:
{{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_postgres ) | indent 6 | trim }}
@@ -115,6 +127,7 @@
- name: {{ include "common.name" . }}-pg-config
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.postgresImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
volumeMounts:
- mountPath: /docker-entrypoint-initdb.d/db-pg.sh
name: {{ include "common.fullname" . }}-config
@@ -123,7 +136,7 @@
- /bin/sh
- -cx
- |
- {{- if include "common.onServiceMesh" . }}
+ {{- if include "common.requireSidecarKiller" . }}
echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
/docker-entrypoint-initdb.d/db-pg.sh
env:
@@ -138,7 +151,7 @@
- name: PG_PORT
value: "{{ .Values.postgres.service.internalPort }}"
resources: {{ include "common.resources" . | nindent 10 }}
- {{- if (include "common.onServiceMesh" .) }}
+ {{- if (include "common.requireSidecarKiller" .) }}
- name: policy-service-mesh-wait-for-job-container
image: {{ include "repositoryGenerator.image.quitQuit" . }}
imagePullPolicy: Always
@@ -154,6 +167,14 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
+ resources:
+ limits:
+ cpu: 100m
+ memory: 500Mi
+ requests:
+ cpu: 10m
+ memory: 10Mi
{{- end }}
restartPolicy: Never
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
@@ -185,9 +206,11 @@
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}-galera-config
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
initContainers:
- name: {{ include "common.name" . }}-init-readiness
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
@@ -210,17 +233,20 @@
memory: "20Mi"
containers:
- name: {{ include "common.name" . }}-galera-db-migrator
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db_migrator_policy_init.sh
name: {{ include "common.fullname" . }}-config
subPath: db_migrator_policy_init.sh
+ - mountPath: /opt/app/policy/etc/db
+ name: db-conf
command:
- /bin/sh
- -cx
- |
- {{- if include "common.onServiceMesh" . }}
+ {{- if include "common.requireSidecarKiller" . }}
echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
/dbcmd-config/db_migrator_policy_init.sh
env:
@@ -237,7 +263,7 @@
- name: SCRIPT_DIRECTORY
value: "sql"
resources: {{ include "common.resources" . | nindent 10 }}
- {{- if (include "common.onServiceMesh" .) }}
+ {{- if (include "common.requireSidecarKiller" .) }}
- name: policy-service-mesh-wait-for-job-container
image: {{ include "repositoryGenerator.image.quitQuit" . }}
imagePullPolicy: Always
@@ -253,6 +279,14 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
+ resources:
+ limits:
+ cpu: 100m
+ memory: 500Mi
+ requests:
+ cpu: 10m
+ memory: 10Mi
{{- end }}
restartPolicy: Never
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
@@ -264,6 +298,10 @@
items:
- key: db_migrator_policy_init.sh
path: db_migrator_policy_init.sh
+ - name: db-conf
+ emptyDir:
+ medium: Memory
+ sizeLimit: 64Mi
{{ end }}
{{ if .Values.global.postgres.localCluster }}
---
@@ -283,9 +321,11 @@
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}-pg-config
spec:
+ {{ include "common.podSecurityContext" . | indent 6 | trim }}
{{- include "common.imagePullSecrets" . | nindent 6 }}
initContainers:
- name: {{ include "common.name" . }}-init-readiness
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
@@ -308,17 +348,20 @@
memory: "20Mi"
containers:
- name: {{ include "common.name" . }}-pg-db-migrator
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db_migrator_pg_policy_init.sh
name: {{ include "common.fullname" . }}-config
subPath: db_migrator_pg_policy_init.sh
+ - mountPath: /opt/app/policy/etc/db
+ name: db-conf
command:
- /bin/sh
- -cx
- |
- {{- if include "common.onServiceMesh" . }}
+ {{- if include "common.requireSidecarKiller" . }}
echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
/dbcmd-config/db_migrator_pg_policy_init.sh
env:
@@ -337,7 +380,7 @@
- name: PGPASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 10 }}
resources: {{ include "common.resources" . | nindent 10 }}
- {{- if (include "common.onServiceMesh" .) }}
+ {{- if (include "common.requireSidecarKiller" .) }}
- name: policy-service-mesh-wait-for-job-container
image: {{ include "repositoryGenerator.image.quitQuit" . }}
imagePullPolicy: Always
@@ -353,6 +396,14 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ {{ include "common.containerSecurityContext" . | indent 8 | trim }}
+ resources:
+ limits:
+ cpu: 100m
+ memory: 500Mi
+ requests:
+ cpu: 10m
+ memory: 10Mi
{{- end }}
restartPolicy: Never
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
@@ -364,4 +415,8 @@
items:
- key: db_migrator_pg_policy_init.sh
path: db_migrator_pg_policy_init.sh
+ - name: db-conf
+ emptyDir:
+ medium: Memory
+ sizeLimit: 64Mi
{{ end }}
diff --git a/kubernetes/policy/templates/policy-kafka-user.yaml b/kubernetes/policy/templates/policy-kafka-user.yaml
index ed399ed..d004cbe 100644
--- a/kubernetes/policy/templates/policy-kafka-user.yaml
+++ b/kubernetes/policy/templates/policy-kafka-user.yaml
@@ -1,5 +1,6 @@
{{/*
# Copyright © 2022-2023 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -29,16 +30,20 @@
- resource:
type: group
name: {{ .Values.config.policyPdpPapTopic.consumer.groupId }}
- operation: All
+ operations:
+ - All
- resource:
type: topic
name: {{ .Values.config.policyPdpPapTopic.name }}
- operation: All
+ operations:
+ - All
- resource:
type: topic
name: {{ .Values.config.policyHeartbeatTopic.name }}
- operation: All
+ operations:
+ - All
- resource:
type: topic
name: {{ .Values.config.policyNotificationTopic.name }}
- operation: All
+ operations:
+ - All
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 68ce42d..ccd8223 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2020 AT&T Intellectual Property
# Modifications Copyright (C) 2021-2024 Nordix Foundation.
+# Modifications Copyright © 2024 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -296,6 +297,10 @@
memory: "2Gi"
unlimited: {}
+securityContext:
+ user_id: 100
+ group_id: 65533
+
#Pods Service Account
serviceAccount:
nameOverride: policy
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index e634f18..5916455 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: SDN Controller
name: sdnc
-version: 14.0.0
+version: 15.0.0
dependencies:
- name: common
@@ -51,10 +51,6 @@
repository: '@local'
condition: sdnc.elasticsearch.enabled,elasticsearch.enabled
# conditions for sdnc-subcharts
- - name: dmaap-listener
- version: ~14.x-0
- repository: '@local'
- condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
- name: ueb-listener
version: ~14.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 09b2c09..3708bd1 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -445,21 +445,6 @@
cds:
enabled: false
-dmaap-listener:
- enabled: true
- nameOverride: sdnc-dmaap-listener
- mariadb-galera:
- <<: *mariadbGalera
- config:
- <<: *mariadbGaleraConfig
- mysqlDatabase: *sdncDbName
- config:
- sdncChartName: sdnc
- dmaapPort: 3904
- sdncPort: 8282
- configDir: /opt/onap/sdnc/data/properties
- odlCredsExternalSecret: *odlCredsSecretName
-
ueb-listener:
enabled: true
mariadb-galera:
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index 7c4a5b7..900a6c9 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: ONAP uui
name: uui
-version: 13.0.0
+version: 13.1.0
dependencies:
- name: common
@@ -39,3 +39,6 @@
- name: uui-intent-analysis
version: ~13.x-0
repository: 'file://components/uui-intent-analysis'
+ - name: uui-llm-adaptation
+ version: ~13.x-0
+ repository: 'file://components/uui-llm-adaptation'
diff --git a/kubernetes/cli/.helmignore b/kubernetes/uui/components/uui-llm-adaptation/.helmignore
similarity index 100%
copy from kubernetes/cli/.helmignore
copy to kubernetes/uui/components/uui-llm-adaptation/.helmignore
diff --git a/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml b/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml
new file mode 100644
index 0000000..1c36c23
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml
@@ -0,0 +1,35 @@
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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: v2
+description: ONAP uui llm adaptation
+name: uui-llm-adaptation
+version: 13.0.0
+
+dependencies:
+ - name: common
+ version: ~13.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~13.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~13.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~13.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~13.x-0
+ repository: '@local'
diff --git a/kubernetes/uui/components/uui-llm-adaptation/resources/config/llm-adaptation-init.sql b/kubernetes/uui/components/uui-llm-adaptation/resources/config/llm-adaptation-init.sql
new file mode 100644
index 0000000..5379c73
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/resources/config/llm-adaptation-init.sql
@@ -0,0 +1,23 @@
+--
+-- Copyright (C) 2024 CMCC, Inc. and others. All rights reserved.
+--
+-- 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.
+--
+
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+create table if not exists intent(
+ intent_id varchar(255) primary key,
+ intent_name varchar(255),
+ intent_generateType VARCHAR (225)
+);
\ No newline at end of file
diff --git a/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh b/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh
new file mode 100644
index 0000000..f1dcefa
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh
@@ -0,0 +1,31 @@
+{{/*
+#
+# Copyright (C) 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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.
+#
+*/}}
+
+main_path="/home/uui"
+echo @main_path@ $main_path
+
+JAVA_PATH="$JAVA_HOME/bin/java"
+JAVA_OPTS="-Xms50m -Xmx128m"
+echo @JAVA_PATH@ $JAVA_PATH
+echo @JAVA_OPTS@ $JAVA_OPTS
+
+jar_path="$main_path/usecase-ui-llm-adaptation.jar"
+echo @jar_path@ $jar_path
+
+echo "Starting usecase-ui-llm-adaptation..."
+$JAVA_PATH $JAVA_OPTS -classpath $jar_path -jar $jar_path $SPRING_OPTS
diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/configmap.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/configmap.yaml
new file mode 100644
index 0000000..3583c41
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/templates/configmap.yaml
@@ -0,0 +1,31 @@
+{{/*
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-entrypoint
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/entrypoint/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml
new file mode 100644
index 0000000..d2824d1
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml
@@ -0,0 +1,74 @@
+{{/*
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+# 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: apps/v1
+kind: Deployment
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+spec:
+ selector: {{- include "common.selectors" . | nindent 4 }}
+ replicas: {{ .Values.replicaCount }}
+ template:
+ metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+ spec:
+ initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
+ containers:
+ - name: {{ include "common.name" . }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ command: ["sh", "-c"]
+ args:
+ - ". /uui/run.sh"
+ ports: {{ include "common.containerPorts" . | nindent 10 }}
+ env:
+ - name: POSTGRES_IP
+ value: {{ .Values.postgres.service.name2 }}
+ - name: POSTGRES_PORT
+ value: "{{ .Values.postgres.service.externalPort }}"
+ - name: POSTGRES_DB_NAME
+ value: {{ .Values.postgres.config.pgDatabase }}
+ - name: POSTGRES_USERNAME
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 10 }}
+ - name: POSTGRES_PASSWORD
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 10 }}
+{{- if eq .Values.liveness.enabled true }}
+ livenessProbe:
+ tcpSocket:
+ port: {{ .Values.liveness.port }}
+ initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.liveness.periodSeconds }}
+{{- end }}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.readiness.port }}
+ initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.readiness.periodSeconds }}
+ resources: {{ include "common.resources" . | nindent 10 }}
+{{- if .Values.nodeSelector }}
+ nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
+{{- end }}
+{{- if .Values.affinity }}
+ affinity: {{ toYaml .Values.affinity | nindent 10 }}
+{{- end }}
+ volumeMounts:
+ - mountPath: /uui/run.sh
+ name: entrypoint
+ subPath: run.sh
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+ volumes:
+ - name: entrypoint
+ configMap:
+ name: {{ include "common.fullname" . }}-entrypoint
+ defaultMode: 0755
+ {{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml
new file mode 100644
index 0000000..90d6d63
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml
@@ -0,0 +1,82 @@
+{{/*
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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: batch/v1
+kind: Job
+metadata:
+ name: {{ include "common.fullname" . }}-init-postgres
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}-job
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+spec:
+ backoffLimit: 20
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}-job
+ release: {{ include "common.release" . }}
+ spec:
+ restartPolicy: Never
+ initContainers:
+ - command:
+ - /app/ready.py
+ args:
+ - --service-name
+ - "{{ .Values.postgres.service.name2 }}"
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ include "repositoryGenerator.image.readiness" . }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "500Mi"
+ requests:
+ cpu: "3m"
+ memory: "20Mi"
+ containers:
+ - name: {{ include "common.name" . }}-job
+ image: {{ include "repositoryGenerator.image.postgres" . }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ env:
+ - name: PGUSER
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 10 }}
+ - name: PGPASSWORD
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 10 }}
+ command:
+ - /bin/sh
+ - -c
+ - |
+ psql -h $(UUI_ADAPTATION_PG_PRIMARY_SERVICE_HOST) -f /aaa/init/llm-adaptation-init.sql -d {{ .Values.postgres.config.pgDatabase }}
+ volumeMounts:
+ - name: init-data
+ mountPath: /aaa/init/llm-adaptation-init.sql
+ subPath: llm-adaptation-init.sql
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
+ {{- include "common.imagePullSecrets" . | nindent 6 }}
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+ volumes:
+ - name: init-data
+ configMap:
+ name: {{ include "common.fullname" . }}
diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/secrets.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/secrets.yaml
new file mode 100644
index 0000000..638e02c
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/templates/secrets.yaml
@@ -0,0 +1,17 @@
+{{/*
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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.
+*/}}
+
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/service.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/service.yaml
new file mode 100644
index 0000000..33e96ef
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/templates/service.yaml
@@ -0,0 +1,17 @@
+{{/*
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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.
+*/}}
+
+{{ include "common.service" . }}
diff --git a/kubernetes/uui/components/uui-llm-adaptation/values.yaml b/kubernetes/uui/components/uui-llm-adaptation/values.yaml
new file mode 100644
index 0000000..f5804ef
--- /dev/null
+++ b/kubernetes/uui/components/uui-llm-adaptation/values.yaml
@@ -0,0 +1,126 @@
+# Copyright © 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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.
+
+# Default values for uui llm adaptation.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+ passwordStrength: long
+
+#Pods Service Account
+serviceAccount:
+ nameOverride: uui-llm-adaptation
+ roles:
+ - read
+
+secrets:
+ - uid: pg-root-pass
+ name: &pgRootPassSecretName '{{ include "common.release" . }}-uui-adaptation-pg-root-pass'
+ type: password
+ externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "uui-adaptation-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
+ password: '{{ .Values.postgres.config.pgRootpassword }}'
+ policy: generate
+ - uid: pg-user-creds
+ name: &pgUserCredsSecretName '{{ include "common.release" . }}-uui-adaptation-pg-user-creds'
+ type: basicAuth
+ externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "uui-adaptation-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+ login: '{{ .Values.postgres.config.pgUserName }}'
+ password: '{{ .Values.postgres.config.pgUserPassword }}'
+ passwordPolicy: generate
+
+image: onap/usecase-ui-llm-adaptation:14.0.0
+pullPolicy: Always
+
+# flag to enable debugging - application support required
+debugEnabled: false
+flavor: small
+replicaCount: 1
+nodeSelector: {}
+affinity: {}
+
+service:
+ type: ClusterIP
+ name: uui-llm-adaptation
+ ports:
+ - name: http-rest
+ port: &svc_port 8084
+
+liveness:
+ initialDelaySeconds: 120
+ port: *svc_port
+ periodSeconds: 10
+ enabled: true
+
+readiness:
+ initialDelaySeconds: 60
+ port: *svc_port
+ periodSeconds: 10
+
+# application configuration override for postgres
+postgres:
+ nameOverride: &postgresName uui-adaptation-postgres
+ service:
+ name: *postgresName
+ name2: uui-adaptation-pg-primary
+ name3: uui-adaptation-pg-replica
+ container:
+ name:
+ primary: uui-adaptation-pg-primary
+ replica: uui-adaptation-pg-replica
+ config:
+ pgUserName: uui
+ pgDatabase: uuiadaptation
+ pgUserExternalSecret: *pgUserCredsSecretName
+ pgRootPasswordExternalSecret: *pgRootPassSecretName
+ persistence:
+ mountSubPath: uui/uuiadaptation/data
+ mountInitPath: uui
+
+readinessCheck:
+ wait_for:
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-job'
+
+# We usually recommend not to specify default resources and to leave this as a conscious
+# choice for the user. This also increases chances charts run on environments with little
+# resources, such as Minikube. If you do want to specify resources, uncomment the following
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+#
+# Example:
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
+# Minimum memory for development is 2 CPU cores and 4GB memory
+# Minimum memory for production is 4 CPU cores and 8GB memory
+resources:
+ small:
+ limits:
+ cpu: "2"
+ memory: "1Gi"
+ requests:
+ cpu: "1"
+ memory: "200Mi"
+ large:
+ limits:
+ cpu: "4"
+ memory: "2Gi"
+ requests:
+ cpu: "2"
+ memory: "1Gi"
+ unlimited: {}
+
