44 files changed, 424 insertions, 147 deletions
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index fb16e824fb..677271c241 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -1,7 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 2020 AT&T
 # Modifications Copyright © 2021 Orange
-# Modifications Copyright © 2021 Nordix Foundation
+# Modifications Copyright © 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.
@@ -59,22 +59,22 @@ dependencies:
     version: ~10.x-0
     repository: 'file://components/policy-clamp-be'
     condition: policy-clamp-be.enabled
-  - name: policy-clamp-cl-k8s-ppnt
+  - name: policy-clamp-ac-k8s-ppnt
     version: ~10.x-0
-    repository: 'file://components/policy-clamp-cl-k8s-ppnt'
-    condition: policy-clamp-cl-k8s-ppnt.enabled
-  - name: policy-clamp-cl-http-ppnt
+    repository: 'file://components/policy-clamp-ac-k8s-ppnt'
+    condition: policy-clamp-ac-k8s-ppnt.enabled
+  - name: policy-clamp-ac-http-ppnt
     version: ~10.x-0
-    repository: 'file://components/policy-clamp-cl-http-ppnt'
-    condition: policy-clamp-cl-http-ppnt.enabled
-  - name: policy-clamp-cl-pf-ppnt
+    repository: 'file://components/policy-clamp-ac-http-ppnt'
+    condition: policy-clamp-ac-http-ppnt.enabled
+  - name: policy-clamp-ac-pf-ppnt
     version: ~10.x-0
-    repository: 'file://components/policy-clamp-cl-pf-ppnt'
-    condition: policy-clamp-cl-pf-ppnt.enabled
-  - name: policy-clamp-cl-runtime
+    repository: 'file://components/policy-clamp-ac-pf-ppnt'
+    condition: policy-clamp-ac-pf-ppnt.enabled
+  - name: policy-clamp-runtime-acm
     version: ~10.x-0
-    repository: 'file://components/policy-clamp-cl-runtime'
-    condition: policy-clamp-cl-runtime.enabled
+    repository: 'file://components/policy-clamp-runtime-acm'
+    condition: policy-clamp-runtime-acm.enabled
   - name: policy-gui
     version: ~10.x-0
     repository: 'file://components/policy-gui'
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
index 4cf7c40590..00cbd28181 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
@@ -1,6 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation.
-#   Modifications Copyright © 2021 Nordix Foundation
+#   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.
@@ -19,7 +18,7 @@
 
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Http Participant
-name: policy-clamp-cl-http-ppnt
+name: policy-clamp-ac-http-ppnt
 version: 10.0.0
 
 dependencies:
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/resources/config/HttpParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
index fd3c1d4438..249aaaebda 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/resources/config/HttpParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -16,6 +16,14 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ============LICENSE_END=========================================================
 
+spring:
+  security:
+    user:
+      name: ${RESTSERVER_USER}
+      password: ${RESTSERVER_PASSWORD}
+security:
+  enable-csrf: false
+
 participant:
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
@@ -24,19 +32,29 @@ participant:
       name: HttpParticipant0
       version: 1.0.0
     participantType:
-      name: org.onap.k8s.controlloop.HttpControlLoopParticipant
+      name: org.onap.policy.clamp.acm.HttpParticipant
       version: 2.3.4
-    clampControlLoopTopics:
+    clampAutomationCompositionTopics:
       topicSources:
-        - topic: POLICY-CLRUNTIME-PARTICIPANT
+        - topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
           useHttps: true
       topicSinks:
-        - topic: POLICY-CLRUNTIME-PARTICIPANT
+        - topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health, metrics, prometheus
+server:
+  port: 8084
+  servlet:
+    context-path: /onap/httpparticipant
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/resources/config/logback.xml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/logback.xml
index b6a853d0a0..b6a853d0a0 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/resources/config/logback.xml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/logback.xml
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/configmap.yaml
index 09cc8cd48f..09cc8cd48f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/configmap.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
index 80eaf761e8..3a5b8b199f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -33,11 +33,16 @@ spec:
         args:
         - -c
         - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done"
+        env:
+        - name: RESTSERVER_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "login") | indent 10 }}
+        - name: RESTSERVER_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "password") | indent 10 }}
         volumeMounts:
         - mountPath: /config-input
-          name: cl-http-ppnt-config
+          name: ac-http-ppnt-config
         - mountPath: /config
-          name: cl-http-ppnt-config-processed
+          name: ac-http-ppnt-config-processed
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
@@ -59,13 +64,28 @@ spec:
           - name: TRUSTSTORE_PASSWD
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "truststore-password" "key" "password") | indent 12 }}
 {{- end }}
+          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.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 }}
           volumeMounts:
 {{ include "common.certInitializer.volumeMount" . | indent 10 }}
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
           - mountPath: /opt/app/policy/clamp/etc/mounted
-            name: cl-http-ppnt-config-processed
+            name: ac-http-ppnt-config-processed
           resources:
 {{ include "common.resources" . }}
         {{- if .Values.nodeSelector }}
@@ -82,11 +102,11 @@ spec:
         - name: localtime
           hostPath:
              path: /etc/localtime
-        - name: cl-http-ppnt-config
+        - name: ac-http-ppnt-config
           configMap:
             name: {{ include "common.fullname" . }}-configmap
             defaultMode: 0755
-        - name: cl-http-ppnt-config-processed
+        - name: ac-http-ppnt-config-processed
           emptyDir:
             medium: Memory
       imagePullSecrets:
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/secrets.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/secrets.yaml
index 0bddc8dfbc..0bddc8dfbc 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/templates/secrets.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/secrets.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/service.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/service.yaml
index be2449f890..e676ff13d7 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/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-cl-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index 44535c99e2..8eafa463c5 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation.
+#   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.
@@ -27,6 +27,12 @@ global:
 # Secrets metaconfig
 #################################################################
 secrets:
+  - uid: restserver-secret
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.restServer.credsExternalSecret) . }}'
+    login: '{{ .Values.restServer.user }}'
+    password: '{{ .Values.restServer.password }}'
+    passwordPolicy: required
   - uid: keystore-password
     type: password
     externalSecret: '{{ tpl (default "" .Values.certStores.keyStorePasswordExternalSecret) . }}'
@@ -43,7 +49,7 @@ certStores:
   trustStorePassword: Pol1cy_0nap
 
 certInitializer:
-  nameOverride: policy-clamp-cl-http-ppnt-cert-initializer
+  nameOverride: policy-clamp-ac-http-ppnt-cert-initializer
   aafDeployFqi: deployer@people.osaaf.org
   aafDeployPass: demo123456!
   fqdn: policy
@@ -65,9 +71,14 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-http-ppnt:6.2.0
+image: onap/policy-clamp-ac-http-ppnt:6.2.1
 pullPolicy: Always
 
+# application configuration
+restServer:
+  user: participantUser
+  password: zb!XztG34
+
 # flag to enable debugging - application support required
 debugEnabled: false
 
@@ -80,6 +91,30 @@ affinity: {}
 ingress:
   enabled: false
 
+# probe configuration parameters
+liveness:
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  # necessary to disable liveness probe when setting breakpoints
+  # in debugger so K8s doesn't restart unresponsive container
+  enabled: true
+  port: http-api
+
+readiness:
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: http-api
+
+service:
+  type: ClusterIP
+  name: policy-clamp-ac-http-ppnt
+  useNodePortExt: true
+  ports:
+    - name: http-api
+      port: 8084
+      nodePort: 42
+
+
 flavor: small
 resources:
   small:
@@ -99,6 +134,6 @@ resources:
   unlimited: {}
 #Pods Service Account
 serviceAccount:
-  nameOverride: policy-clamp-cl-http-ppnt
+  nameOverride: policy-clamp-ac-http-ppnt
   roles:
     - read
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
index 0427a423bc..b55cb35649 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #  Copyright (C) 2021 Nordix Foundation. All rights reserved.
 #  Modifications Copyright © 2021 Orange
-#  Modifications Copyright © 2021 Nordix Foundation
+#  Modifications Copyright © 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.
@@ -20,7 +20,7 @@
 
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop K8s Participant
-name: policy-clamp-cl-k8s-ppnt
+name: policy-clamp-ac-k8s-ppnt
 version: 10.0.0
 
 dependencies:
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 7227ee8ded..0b7e2ab22d 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -34,12 +34,12 @@ participant:
       name: K8sParticipant0
       version: 1.0.0
     participantType:
-      name: org.onap.k8s.controlloop.K8SControlLoopParticipant
+      name: org.onap.policy.clamp.acm.KubernetesParticipant
       version: 2.3.4
-    clampControlLoopTopics:
+    clampAutomationCompositionTopics:
       topicSources:
         -
-          topic: POLICY-CLRUNTIME-PARTICIPANT
+          topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
@@ -47,12 +47,18 @@ participant:
           useHttps: true
       topicSinks:
         -
-          topic: POLICY-CLRUNTIME-PARTICIPANT
+          topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health, metrics, prometheus
+
 server:
   # Configuration of the HTTP/REST server. The parameters are defined and handled by the springboot framework.
   # See springboot documentation.
@@ -82,4 +88,4 @@ helm:
   repos:
     -
       repoName: bitnami
-      address: https://charts.bitnami.com/bitnami
-\ No newline at end of file
+      address: https://charts.bitnami.com/bitnami
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/logback.xml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/logback.xml
index a09b4783c3..a09b4783c3 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/logback.xml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/logback.xml
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
index 09cc8cd48f..09cc8cd48f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
index 72a3d0ea27..14cb6d3f4e 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -40,9 +40,9 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "password") | indent 10 }}
         volumeMounts:
         - mountPath: /config-input
-          name: cl-k8s-ppnt-config
+          name: ac-k8s-ppnt-config
         - mountPath: /config
-          name: cl-k8s-ppnt-config-processed
+          name: ac-k8s-ppnt-config-processed
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
@@ -85,7 +85,7 @@ spec:
             name: localtime
             readOnly: true
           - mountPath: /opt/app/policy/clamp/etc/mounted
-            name: cl-k8s-ppnt-config-processed
+            name: ac-k8s-ppnt-config-processed
           resources:
 {{ include "common.resources" . }}
         {{- if .Values.nodeSelector }}
@@ -102,11 +102,11 @@ spec:
         - name: localtime
           hostPath:
              path: /etc/localtime
-        - name: cl-k8s-ppnt-config
+        - name: ac-k8s-ppnt-config
           configMap:
             name: {{ include "common.fullname" . }}-configmap
             defaultMode: 0755
-        - name: cl-k8s-ppnt-config-processed
+        - name: ac-k8s-ppnt-config-processed
           emptyDir:
             medium: Memory
       imagePullSecrets:
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/secrets.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/secrets.yaml
index f0f3c5e993..f0f3c5e993 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/secrets.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/secrets.yaml
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
new file mode 100644
index 0000000000..73381c9e3b
--- /dev/null
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/service.yaml
@@ -0,0 +1,45 @@
+{{/*
+#  ============LICENSE_START=======================================================
+#   Copyright (C) 2021-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=========================================================
+*/}}
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: policy-clamp-cl-k8s-ppnt
+  namespace: {{ include "common.namespace" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "common.namespace" . }}-policy-clamp-cl-k8s-ppnt-binding
+  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: policy-clamp-cl-k8s-ppnt
+    namespace: {{ include "common.namespace" . }}
+
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index 701536a168..a3fb19f1bc 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#  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.
@@ -50,7 +50,7 @@ certStores:
   trustStorePassword: Pol1cy_0nap
 
 certInitializer:
-  nameOverride: policy-clamp-cl-k8s-ppnt-cert-initializer
+  nameOverride: policy-clamp-ac-k8s-ppnt-cert-initializer
   aafDeployFqi: deployer@people.osaaf.org
   aafDeployPass: demo123456!
   fqdn: policy
@@ -72,7 +72,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-k8s-ppnt:6.2.0
+image: onap/policy-clamp-ac-k8s-ppnt:6.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -105,7 +105,7 @@ readiness:
 
 service:
   type: ClusterIP
-  name: policy-clamp-cl-k8s-ppnt
+  name: policy-clamp-ac-k8s-ppnt
   useNodePortExt: true
   ports:
   - name: http-api
@@ -135,6 +135,6 @@ resources:
 
 #Pods Service Account
 serviceAccount:
-  nameOverride: policy-clamp-cl-k8s-ppnt
+  nameOverride: policy-clamp-ac-k8s-ppnt
   roles:
     - create
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
index d80fa4d2da..ae8d03bc13 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
@@ -1,6 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
-#   Modifications Copyright © 2021 Nordix Foundation
+#   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.
@@ -19,7 +18,7 @@
 
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Policy Participant
-name: policy-clamp-cl-pf-ppnt
+name: policy-clamp-ac-pf-ppnt
 version: 10.0.0
 
 dependencies:
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
index 16d41131a1..0160ff45df 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -16,6 +16,14 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ============LICENSE_END=========================================================
 
+spring:
+  security:
+    user:
+      name: ${RESTSERVER_USER}
+      password: ${RESTSERVER_PASSWORD}
+security:
+  enable-csrf: false
+
 participant:
   pdpGroup: defaultGroup
   pdpType: apex
@@ -42,12 +50,12 @@ participant:
       name: org.onap.PM_Policy
       version: 1.0.0
     participantType:
-      name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+      name: org.onap.policy.clamp.acm.PolicyParticipant
       version: 2.3.1
-    clampControlLoopTopics:
+    clampAutomationCompositionTopics:
       topicSources:
         -
-          topic: POLICY-CLRUNTIME-PARTICIPANT
+          topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
@@ -55,8 +63,19 @@ participant:
           useHttps: true
       topicSinks:
         -
-          topic: POLICY-CLRUNTIME-PARTICIPANT
+          topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health, metrics, prometheus
+
+server:
+  port: 8085
+  servlet:
+    context-path: /onap/policyparticipant
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/resources/config/logback.xml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/logback.xml
index 1447eb49fc..1447eb49fc 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/resources/config/logback.xml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/logback.xml
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/configmap.yaml
index 09cc8cd48f..09cc8cd48f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/configmap.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
index 2317194e96..b13e013f47 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -42,11 +42,15 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pap-secret" "key" "login") | indent 10 }}
         - name: PAP_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pap-secret" "key" "password") | indent 10 }}
+        - name: RESTSERVER_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "login") | indent 10 }}
+        - name: RESTSERVER_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "password") | indent 10 }}
         volumeMounts:
         - mountPath: /config-input
-          name: cl-pf-ppnt-config
+          name: ac-pf-ppnt-config
         - mountPath: /config
-          name: cl-pf-ppnt-config-processed
+          name: ac-pf-ppnt-config-processed
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
@@ -68,13 +72,28 @@ spec:
           - name: TRUSTSTORE_PASSWD
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "truststore-password" "key" "password") | indent 12 }}
 {{- end }}
+          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.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 }}
           volumeMounts:
 {{ include "common.certInitializer.volumeMount" . | indent 10 }}
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
           - mountPath: /opt/app/policy/clamp/etc/mounted
-            name: cl-pf-ppnt-config-processed
+            name: ac-pf-ppnt-config-processed
           resources:
 {{ include "common.resources" . }}
         {{- if .Values.nodeSelector }}
@@ -91,11 +110,11 @@ spec:
         - name: localtime
           hostPath:
              path: /etc/localtime
-        - name: cl-pf-ppnt-config
+        - name: ac-pf-ppnt-config
           configMap:
             name: {{ include "common.fullname" . }}-configmap
             defaultMode: 0755
-        - name: cl-pf-ppnt-config-processed
+        - name: ac-pf-ppnt-config-processed
           emptyDir:
             medium: Memory
       imagePullSecrets:
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/templates/secrets.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/secrets.yaml
index f0f3c5e993..f0f3c5e993 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/templates/secrets.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/secrets.yaml
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
new file mode 100644
index 0000000000..e676ff13d7
--- /dev/null
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/service.yaml
@@ -0,0 +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" . }}
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index ef8a7c0745..c825ab1a0c 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -27,6 +27,12 @@ global:
 # Secrets metaconfig
 #################################################################
 secrets:
+  - uid: restserver-secret
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.restServer.credsExternalSecret) . }}'
+    login: '{{ .Values.restServer.participantppnt.user }}'
+    password: '{{ .Values.restServer.participantppnt.password }}'
+    passwordPolicy: required
   - uid: api-secret
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.restServer.apiUserExternalSecret) . }}'
@@ -55,7 +61,7 @@ certStores:
   trustStorePassword: Pol1cy_0nap
 
 certInitializer:
-  nameOverride: policy-clamp-cl-pf-ppnt-cert-initializer
+  nameOverride: policy-clamp-ac-pf-ppnt-cert-initializer
   aafDeployFqi: deployer@people.osaaf.org
   aafDeployPass: demo123456!
   fqdn: policy
@@ -77,7 +83,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-pf-ppnt:6.2.0
+image: onap/policy-clamp-ac-pf-ppnt:6.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -94,6 +100,9 @@ restServer:
   pap:
     user: policyadmin
     password: none
+  participantppnt:
+    user: participantUser
+    password: none
 
 nodeSelector: {}
 
@@ -101,6 +110,29 @@ affinity: {}
 ingress:
   enabled: false
 
+# probe configuration parameters
+liveness:
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  # necessary to disable liveness probe when setting breakpoints
+  # in debugger so K8s doesn't restart unresponsive container
+  enabled: true
+  port: http-api
+
+readiness:
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: http-api
+
+service:
+  type: ClusterIP
+  name: policy-clamp-ac-pf-ppnt
+  useNodePortExt: true
+  ports:
+    - name: http-api
+      port: 8085
+      nodePort: 42
+
 flavor: small
 resources:
   small:
@@ -120,6 +152,6 @@ resources:
   unlimited: {}
 #Pods Service Account
 serviceAccount:
-  nameOverride: policy-clamp-cl-pf-ppnt
+  nameOverride: policy-clamp-ac-pf-ppnt
   roles:
     - read
diff --git a/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties b/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties
index b9a4ed33a8..03e55e15f5 100644
--- a/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties
+++ b/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties
@@ -7,6 +7,7 @@
 #                             reserved.
 # ================================================================================
 # Modifications copyright (c) 2019 Nokia
+# Modifications Copyright (c) 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.
@@ -71,7 +72,6 @@ clamp.config.dcae.deployment.password=none
 clamp.config.cadi.aafLocateUrl=https://aaf-locate.{{ include "common.namespace" . }}:8095
 
 # Configuration settings for ControlLoop Runtime Rest API
-clamp.config.controlloop.runtime.url=https://policy-clamp-cl-runtime.{{ include "common.namespace" . }}:6969
-clamp.config.controlloop.runtime.userName=${RUNTIME_USER}
-clamp.config.controlloop.runtime.password=${RUNTIME_PASSWORD}
-
+clamp.config.acm.runtime.url=https://policy-clamp-runtime-acm.{{ include "common.namespace" . }}:6969
+clamp.config.acm.runtime.userName=${RUNTIME_USER}
+clamp.config.acm.runtime.password=${RUNTIME_PASSWORD}
diff --git a/kubernetes/policy/components/policy-clamp-be/values.yaml b/kubernetes/policy/components/policy-clamp-be/values.yaml
index 85e97b9af3..2016b14043 100644
--- a/kubernetes/policy/components/policy-clamp-be/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018-2021 AT&T
+# Modifications Copyright © 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.
@@ -70,7 +71,7 @@ secrets:
 flavor: small
 
 # application image
-image: onap/policy-clamp-backend:6.2.0
+image: onap/policy-clamp-backend:6.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
index 0adfd34a7c..90e9293f56 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2021 Nordix Foundation. All rights reserved.
 #   Modifications Copyright © 2021 Orange
-#   Modifications Copyright © 2021 Nordix Foundation
+#   Modifications Copyright © 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.
@@ -20,7 +20,7 @@
 
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Runtime
-name: policy-clamp-cl-runtime
+name: policy-clamp-runtime-acm
 version: 10.0.0
 
 dependencies:
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/clRuntimeParameters.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index 157db833b2..2b52a2b892 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/clRuntimeParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2022 Nordix Foundation. All rights reserved.
+#   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.
@@ -25,7 +25,7 @@ spring:
     converters:
       preferred-json-mapper: gson
   datasource:
-    url: jdbc:mariadb://{{ .Values.db.service.name }}:{{ .Values.db.service.internalPort }}/controlloop
+    url: jdbc:mariadb://{{ .Values.db.service.name }}:{{ .Values.db.service.internalPort }}/clampacm
     driverClassName: org.mariadb.jdbc.Driver
     username: ${SQL_USER}
     password: ${SQL_PASSWORD}
@@ -34,6 +34,16 @@ spring:
       idleTimeout: 600000
       maxLifetime: 1800000
       maximumPoolSize: 10
+  jpa:
+    hibernate:
+      ddl-auto: update
+      naming:
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+        implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDB103Dialect
+        format_sql: true
 
 security:
   enable-csrf: false
@@ -41,15 +51,12 @@ security:
 server:
   port: 6969
   servlet:
-    context-path: /onap/controlloop
+    context-path: /onap/policy/clamp/acm
   error:
     path: /error
 
 
 runtime:
-  supervisionScannerIntervalSec: 1000
-  participantClUpdateIntervalSec: 1000
-  participantClStateChangeIntervalSec: 1000
   participantParameters:
     heartBeatMs: 120000
     maxMessageAgeMs: 600000
@@ -57,19 +64,10 @@ runtime:
     updateParameters:
       maxRetryCount: 3
       maxWaitMs: 100000
-  databasePlatform: org.eclipse.persistence.platform.database.MySQLPlatform
-  databaseProviderParameters:
-    name: PolicyProviderParameterGroup
-    implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl
-    databaseDriver: org.mariadb.jdbc.Driver
-    databaseUrl: jdbc:mariadb://{{ .Values.db.service.name }}:{{ .Values.db.service.internalPort }}/controlloop
-    databaseUser: ${SQL_USER}
-    databasePassword: ${SQL_PASSWORD}
-    persistenceUnit: CommissioningMariaDb
   topicParameterGroup:
     topicSources:
       -
-        topic: POLICY-CLRUNTIME-PARTICIPANT
+        topic: POLICY-ACRUNTIME-PARTICIPANT
         servers:
           - ${topicServer:message-router}
         topicCommInfrastructure: dmaap
@@ -77,7 +75,7 @@ runtime:
         fetchTimeout: 15000
     topicSinks:
       -
-        topic: POLICY-CLRUNTIME-PARTICIPANT
+        topic: POLICY-ACRUNTIME-PARTICIPANT
         servers:
           - ${topicServer:message-router}
         topicCommInfrastructure: dmaap
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/logback.xml b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/logback.xml
index 43cea65306..206b19b049 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/logback.xml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+   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.
@@ -20,7 +20,7 @@
     <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>/var/log/onap/policy/pap/error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>/var/log/onap/policy/policy-clamp-cl-runtime/error.%d{yyyy-MM-dd}.%i.log.zip
+            <fileNamePattern>/var/log/onap/policy/policy-clamp-runtime-acm/error.%d{yyyy-MM-dd}.%i.log.zip
             </fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>30</maxHistory>
@@ -41,7 +41,7 @@
     <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>/var/log/onap/policy/pap/debug.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>/var/log/onap/policy/policy-clamp-cl-runtime/debug.%d{yyyy-MM-dd}.%i.log.zip
+            <fileNamePattern>/var/log/onap/policy/policy-clamp-runtime-acm/debug.%d{yyyy-MM-dd}.%i.log.zip
             </fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>30</maxHistory>
@@ -57,9 +57,9 @@
     </appender>
 
     <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/var/log/onap/policy/policy-clamp-cl-runtime/network.log</file>
+        <file>/var/log/onap/policy/policy-clamp-runtime-acm/network.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>/var/log/onap/policy/policy-clamp-cl-runtime/network.%d{yyyy-MM-dd}.%i.log.zip
+            <fileNamePattern>/var/log/onap/policy/policy-clamp-runtime-acm/network.%d{yyyy-MM-dd}.%i.log.zip
             </fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>30</maxHistory>
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/configmap.yaml
index 66c096d439..66c096d439 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/configmap.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index 92e5c9e6c8..e302704201 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -58,9 +58,9 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "runtime-secret" "key" "password") | indent 10 }}
         volumeMounts:
         - mountPath: /config-input
-          name: cl-runtime-config
+          name: ac-runtime-config
         - mountPath: /config
-          name: cl-runtime-config-processed
+          name: ac-runtime-config-processed
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
@@ -72,10 +72,10 @@ spec:
 {{- if .Values.global.aafEnabled }}
           command: ["sh","-c"]
           args: ["source {{ .Values.certInitializer.credsPath }}/.ci;\
-                  /opt/app/policy/clamp/bin/controlloop-runtime.sh /opt/app/policy/clamp/etc/mounted/clRuntimeParameters.yaml"]
+                  /opt/app/policy/clamp/bin/acm-runtime.sh /opt/app/policy/clamp/etc/mounted/acRuntimeParameters.yaml"]
 {{- else }}
-          command: ["/opt/app/policy/clamp/bin/controlloop-runtime.sh"]
-          args: ["/opt/app/policy/clamp/etc/mounted/clRuntimeParameters.yaml"]
+          command: ["/opt/app/policy/clamp/bin/acm-runtime.sh"]
+          args: ["/opt/app/policy/clamp/etc/mounted/acRuntimeParameters.yaml"]
           env:
           - name: KEYSTORE_PASSWD
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "keystore-password" "key" "password") | indent 12 }}
@@ -103,7 +103,7 @@ spec:
             name: localtime
             readOnly: true
           - mountPath: /opt/app/policy/clamp/etc/mounted
-            name: cl-runtime-config-processed
+            name: ac-runtime-config-processed
           resources:
 {{ include "common.resources" . }}
         {{- if .Values.nodeSelector }}
@@ -120,11 +120,11 @@ spec:
         - name: localtime
           hostPath:
              path: /etc/localtime
-        - name: cl-runtime-config
+        - name: ac-runtime-config
           configMap:
             name: {{ include "common.fullname" . }}-configmap
             defaultMode: 0755
-        - name: cl-runtime-config-processed
+        - name: ac-runtime-config-processed
           emptyDir:
             medium: Memory
       imagePullSecrets:
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/secrets.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/secrets.yaml
index abbfa3fdba..abbfa3fdba 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/templates/secrets.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/secrets.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/service.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/service.yaml
index be2449f890..be2449f890 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/templates/service.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/service.yaml
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index 59d7d313a8..1b571fc502 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   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.
@@ -56,7 +56,7 @@ certStores:
   trustStorePassword: Pol1cy_0nap
 
 certInitializer:
-  nameOverride: policy-clamp-cl-runtime-cert-initializer
+  nameOverride: policy-clamp-runtime-acm-cert-initializer
   aafDeployFqi: deployer@people.osaaf.org
   aafDeployPass: demo123456!
   fqdn: policy
@@ -78,7 +78,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-runtime:6.2.0
+image: onap/policy-clamp-runtime-acm:6.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -119,7 +119,7 @@ readiness:
 
 service:
   type: ClusterIP
-  name: policy-clamp-cl-runtime
+  name: policy-clamp-runtime-acm
   useNodePortExt: true
   ports:
   - name: http-api
@@ -149,6 +149,6 @@ resources:
 
 #Pods Service Account
 serviceAccount:
-  nameOverride: policy-clamp-cl-runtime
+  nameOverride: policy-clamp-runtime-acm
   roles:
     - read
diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
index ff532ab5c1..57fa29bc3d 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
@@ -1,6 +1,6 @@
 {{/*
 # Copyright © 2017-2018 Amdocs, Bell Canada.
-# Modifications Copyright (C) 2018-2020 AT&T Intellectual Property.
+# Modifications Copyright (C) 2018-2020, 2022 AT&T Intellectual Property.
 # Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,6 +43,9 @@ REPOSITORY_OFFLINE={{.Values.nexus.offline}}
 SQL_HOST={{ .Values.db.name }}
 SQL_PORT=3306
 
+# Liveness
+LIVENESS_CONTROLLERS=*
+
 # AAF
 
 AAF={{.Values.aaf.enabled}}
diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/logback.xml b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/logback.xml
index 2fc08e4e5d..a25a7e16d3 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/logback.xml
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/logback.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2020 Bell Canada. All rights reserved.
-   Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2021-2022 AT&T Intellectual Property. 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.
@@ -150,6 +150,8 @@
         <appender-ref ref="AsyncStdOut" />
     </logger>
 
+    <appender name="PromLogback" class="io.prometheus.client.logback.InstrumentedAppender"/>
+
     <root level="INFO">
         <appender-ref ref="AsyncDebugOut" />
         <appender-ref ref="AsyncErrorOut" />
@@ -158,6 +160,7 @@
         <appender-ref ref="AsyncStdOut" />
         <appender-ref ref="AsyncMetricStdOut" />
         <appender-ref ref="AsyncTransactionStdOut" />
+        <appender-ref ref="PromLogback" />
     </root>
 
 </configuration>
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
new file mode 100644
index 0000000000..1c04296e4f
--- /dev/null
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
@@ -0,0 +1,23 @@
+{{/*
+# ============LICENSE_START=======================================================
+#  Copyright (c) 2022 AT&T Intellectual Property
+# ================================================================================
+# 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=========================================================
+*/}}
+
+{{- if .Values.prometheus.enabled }}
+{{ include "common.serviceMonitor" . }}
+{{- end }}
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index d389246b5c..7dee453771 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -1,6 +1,6 @@
 {{/*
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018-2020 AT&T Intellectual Property
+# Modifications Copyright © 2018-2020, 2022 AT&T Intellectual Property
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -83,10 +83,12 @@ spec:
           - containerPort: {{ .Values.service.externalPort2 }}
           {{- if eq .Values.liveness.enabled true }}
           livenessProbe:
-            tcpSocket:
-              port: {{ .Values.service.externalPort }}
+            httpGet:
+              path: /healthcheck/controllers
+              port: 6968
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           {{- end }}
           readinessProbe:
             tcpSocket:
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 2ce7503015..344a600afe 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2017 Amdocs
 # Copyright © 2017, 2021 Bell Canada
-# Modifications Copyright © 2018-2021 AT&T Intellectual Property
+# Modifications Copyright © 2018-2022 AT&T Intellectual Property
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,12 +30,18 @@ secrets:
     login: '{{ .Values.db.user }}'
     password: '{{ .Values.db.password }}'
     passwordPolicy: required
+  - uid: telemetry-creds
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.telemetry.credsExternalSecret) . }}'
+    login: '{{ .Values.telemetry.user }}'
+    password: '{{ .Values.telemetry.password }}'
+    passwordPolicy: required
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.10.1
+image: onap/policy-pdpd-cl:1.10.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -51,7 +57,8 @@ affinity: {}
 # probe configuration parameters
 liveness:
   initialDelaySeconds: 180
-  periodSeconds: 10
+  periodSeconds: 60
+  timeoutSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
@@ -195,3 +202,27 @@ serviceAccount:
   nameOverride: policy-drools-pdp
   roles:
     - read
+
+prometheus:
+  enabled: true
+
+metrics:
+  serviceMonitor:
+    # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
+    # The default operator for prometheus enforces the below label.
+    labels:
+      release: prometheus
+    enabled: true
+    port: policy-drools-pdp-9696
+    interval: 60s
+    isHttps: true
+    basicAuth:
+      enabled: true
+      externalSecretNameSuffix: policy-drools-pdp-telemetry-creds
+      externalSecretUserKey: login
+      externalSecretPasswordKey: password
+    selector:
+      app: '{{ include "common.name" . }}'
+      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+      release: '{{ include "common.release" . }}'
+      heritage: '{{ .Release.Service }}'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/resources/config/logback.xml b/kubernetes/policy/components/policy-xacml-pdp/resources/config/logback.xml
index cc7f8e56c1..fad7e72509 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/resources/config/logback.xml
+++ b/kubernetes/policy/components/policy-xacml-pdp/resources/config/logback.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2020 Bell Canada. All rights reserved.
-   Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2021-2022 AT&T Intellectual Property. 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.
@@ -95,10 +95,13 @@
         <appender-ref ref="AsyncStdOut" />
     </logger>
 
+    <appender name="PromLogback" class="io.prometheus.client.logback.InstrumentedAppender"/>
+
     <root level="INFO">
         <appender-ref ref="AsyncDebugOut" />
         <appender-ref ref="AsyncErrorOut" />
         <appender-ref ref="AsyncStdOut" />
+        <appender-ref ref="PromLogback" />
     </root>
 
 </configuration>
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 504313832d..308b5a78af 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -83,7 +83,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.6.1
+image: onap/policy-xacml-pdp:2.6.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/resources/config/db.sh b/kubernetes/policy/resources/config/db.sh
index 787ec0adbe..866d422c14 100755
--- a/kubernetes/policy/resources/config/db.sh
+++ b/kubernetes/policy/resources/config/db.sh
@@ -19,7 +19,7 @@
 
 mysql() { /usr/bin/mysql  -h ${MYSQL_HOST} -P ${MYSQL_USER} "$@"; };
 
-for db in migration pooling policyadmin policyclamp operationshistory controlloop
+for db in migration pooling policyadmin policyclamp operationshistory clampacm
 do
     mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};"
     mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;"
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 77d3c3f83e..759ba56b02 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018-2020 AT&T Intellectual Property
-# Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications 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.
@@ -98,18 +98,18 @@ policy-clamp-be:
   db: *dbSecretsHook
   config:
     appUserExternalSecret: *policyAppCredsSecret
-policy-clamp-cl-k8s-ppnt:
+policy-clamp-ac-k8s-ppnt:
   enabled: true
-policy-clamp-cl-pf-ppnt:
+policy-clamp-ac-pf-ppnt:
   enabled: true
   restServer:
     apiUserExternalSecret: *policyApiCredsSecret
     papUserExternalSecret: *policyPapCredsSecret
-policy-clamp-cl-http-ppnt:
+policy-clamp-ac-http-ppnt:
   enabled: true
 policy-nexus:
   enabled: false
-policy-clamp-cl-runtime:
+policy-clamp-runtime-acm:
   enabled: true
   db: *dbSecretsHook
   config: