From e5a8cd2bc4c727cdf3d35c9730a24c96e6a73452 Mon Sep 17 00:00:00 2001
From: andresanaya21 <alvaroandres.anayaamariles@telefonica.com>
Date: Wed, 5 Jun 2024 16:57:42 +0200
Subject: [PATCH] access-control-policy

---
 helm/capif/Chart.yaml                         |   2 +
 .../charts/access-control-policy/.helmignore  |  23 ++++
 .../charts/access-control-policy/Chart.yaml   |  24 ++++
 .../access-control-policy/templates/NOTES.txt |  22 ++++
 .../templates/_helpers.tpl                    |  62 ++++++++++
 .../templates/deployment.yaml                 |  71 +++++++++++
 .../access-control-policy/templates/hpa.yaml  |  32 +++++
 .../templates/ingress.yaml                    |  61 ++++++++++
 .../templates/service.yaml                    |  15 +++
 .../templates/serviceaccount.yaml             |  13 ++
 .../templates/tests/test-connection.yaml      |  15 +++
 .../charts/access-control-policy/values.yaml  | 112 ++++++++++++++++++
 .../templates/access-control-policy.yaml      |  17 ---
 helm/capif/templates/deployment.yaml          |  95 ---------------
 helm/capif/values.yaml                        |  25 ----
 15 files changed, 452 insertions(+), 137 deletions(-)
 create mode 100644 helm/capif/charts/access-control-policy/.helmignore
 create mode 100644 helm/capif/charts/access-control-policy/Chart.yaml
 create mode 100644 helm/capif/charts/access-control-policy/templates/NOTES.txt
 create mode 100644 helm/capif/charts/access-control-policy/templates/_helpers.tpl
 create mode 100644 helm/capif/charts/access-control-policy/templates/deployment.yaml
 create mode 100644 helm/capif/charts/access-control-policy/templates/hpa.yaml
 create mode 100644 helm/capif/charts/access-control-policy/templates/ingress.yaml
 create mode 100644 helm/capif/charts/access-control-policy/templates/service.yaml
 create mode 100644 helm/capif/charts/access-control-policy/templates/serviceaccount.yaml
 create mode 100644 helm/capif/charts/access-control-policy/templates/tests/test-connection.yaml
 create mode 100644 helm/capif/charts/access-control-policy/values.yaml
 delete mode 100644 helm/capif/templates/access-control-policy.yaml

diff --git a/helm/capif/Chart.yaml b/helm/capif/Chart.yaml
index fc0c9676..b76f4683 100644
--- a/helm/capif/Chart.yaml
+++ b/helm/capif/Chart.yaml
@@ -20,6 +20,8 @@ version: v3.1.6
 # It is recommended to use it with quotes.
 appVersion: "v3.1.6"
 dependencies:
+  - name: access-control-policy
+    version: "*"
   - name: helper
     version: "*"
   - name: "tempo"
diff --git a/helm/capif/charts/access-control-policy/.helmignore b/helm/capif/charts/access-control-policy/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/helm/capif/charts/access-control-policy/Chart.yaml b/helm/capif/charts/access-control-policy/Chart.yaml
new file mode 100644
index 00000000..b13bbf0b
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: access-control-policy
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/helm/capif/charts/access-control-policy/templates/NOTES.txt b/helm/capif/charts/access-control-policy/templates/NOTES.txt
new file mode 100644
index 00000000..2c54f9db
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "access-control-policy.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.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 --namespace {{ .Release.Namespace }} svc -w {{ include "access-control-policy.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "access-control-policy.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "access-control-policy.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
diff --git a/helm/capif/charts/access-control-policy/templates/_helpers.tpl b/helm/capif/charts/access-control-policy/templates/_helpers.tpl
new file mode 100644
index 00000000..4b87b90e
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "access-control-policy.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "access-control-policy.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "access-control-policy.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "access-control-policy.labels" -}}
+helm.sh/chart: {{ include "access-control-policy.chart" . }}
+{{ include "access-control-policy.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "access-control-policy.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "access-control-policy.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "access-control-policy.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "access-control-policy.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/helm/capif/charts/access-control-policy/templates/deployment.yaml b/helm/capif/charts/access-control-policy/templates/deployment.yaml
new file mode 100644
index 00000000..2e4d15f1
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/deployment.yaml
@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "access-control-policy.fullname" . }}
+  labels:
+    {{- include "access-control-policy.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "access-control-policy.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+         date: "{{  now | unixEpoch }}"
+      labels:
+        {{- include "access-control-policy.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "access-control-policy.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          env:
+          - name: CAPIF_HOSTNAME
+            value: {{ quote .Values.env.capifHostname }}
+          - name: MONITORING
+            value: {{ quote .Values.env.monitoring }}
+          livenessProbe:
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/helm/capif/charts/access-control-policy/templates/hpa.yaml b/helm/capif/charts/access-control-policy/templates/hpa.yaml
new file mode 100644
index 00000000..67eb1954
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "access-control-policy.fullname" . }}
+  labels:
+    {{- include "access-control-policy.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "access-control-policy.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/helm/capif/charts/access-control-policy/templates/ingress.yaml b/helm/capif/charts/access-control-policy/templates/ingress.yaml
new file mode 100644
index 00000000..dcafedb8
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/ingress.yaml
@@ -0,0 +1,61 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "access-control-policy.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "access-control-policy.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/helm/capif/charts/access-control-policy/templates/service.yaml b/helm/capif/charts/access-control-policy/templates/service.yaml
new file mode 100644
index 00000000..c10293a0
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: access-control-policy
+  labels:
+    {{- include "access-control-policy.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "access-control-policy.selectorLabels" . | nindent 4 }}
diff --git a/helm/capif/charts/access-control-policy/templates/serviceaccount.yaml b/helm/capif/charts/access-control-policy/templates/serviceaccount.yaml
new file mode 100644
index 00000000..fc12b544
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "access-control-policy.serviceAccountName" . }}
+  labels:
+    {{- include "access-control-policy.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}
diff --git a/helm/capif/charts/access-control-policy/templates/tests/test-connection.yaml b/helm/capif/charts/access-control-policy/templates/tests/test-connection.yaml
new file mode 100644
index 00000000..0e67abf1
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "access-control-policy.fullname" . }}-test-connection"
+  labels:
+    {{- include "access-control-policy.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "access-control-policy.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/helm/capif/charts/access-control-policy/values.yaml b/helm/capif/charts/access-control-policy/values.yaml
new file mode 100644
index 00000000..61aba34b
--- /dev/null
+++ b/helm/capif/charts/access-control-policy/values.yaml
@@ -0,0 +1,112 @@
+# Default values for access-control-policy.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: access-control-policy
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+env:
+  capifHostname: my-capif.apps.ocp-epg.hi.inet
+  monitoring: "true"
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Automatically mount a ServiceAccount's API credentials?
+  automount: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 8080
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+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:'.
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+
+livenessProbe:
+#  httpGet:
+#    path: /
+#    port: http
+readinessProbe:
+  tcpSocket:
+    port: 8080
+  initialDelaySeconds: 10
+  periodSeconds: 5
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
+volumes: []
+# - name: foo
+#   secret:
+#     secretName: mysecret
+#     optional: false
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+#   mountPath: "/etc/foo"
+#   readOnly: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/helm/capif/templates/access-control-policy.yaml b/helm/capif/templates/access-control-policy.yaml
deleted file mode 100644
index 8b2b198b..00000000
--- a/helm/capif/templates/access-control-policy.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: access-control-policy
-  labels:
-    io.kompose.service: access-control-policy
-  {{- include "capif.labels" . | nindent 4 }}
-  annotations:
-    kompose.cmd: kompose -f ../services/docker-compose.yml convert
-    kompose.version: 1.28.0 (c4137012e)
-spec:
-  type: {{ .Values.accessControlPolicy.type }}
-  selector:
-    io.kompose.service: access-control-policy
-  {{- include "capif.selectorLabels" . | nindent 4 }}
-  ports:
-	{{- .Values.accessControlPolicy.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/deployment.yaml b/helm/capif/templates/deployment.yaml
index ff5ffe29..4f581002 100644
--- a/helm/capif/templates/deployment.yaml
+++ b/helm/capif/templates/deployment.yaml
@@ -1,98 +1,3 @@
-{{- if eq .Values.CapifClient.enable "true" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: capif-client
-  labels:
-    io.kompose.service: capif-client
-  {{- include "capif.labels" . | nindent 4 }}
-  annotations:
-    kompose.cmd: kompose -f ../services/docker-compose.yml convert
-spec:
-  replicas: {{ .Values.CapifClient.replicas }}
-  selector:
-    matchLabels:
-      io.kompose.service: capif-client
-    {{- include "capif.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        io.kompose.network/services-default: "true"
-        io.kompose.service: capif-client
-      {{- include "capif.selectorLabels" . | nindent 8 }}
-      annotations:
-        date: "{{  now | unixEpoch }}"
-    spec:
-      hostAliases:
-        - ip: "{{ .Values.ingress.ip }}"
-          hostnames:
-            - "{{ .Values.nginx.nginx.env.capifHostname }}"
-      containers:
-      - env:
-        - name: CAPIF_HOSTNAME
-          value: nginx.mon.svc.cluster.local
-        - name: VAULT_HOSTNAME
-          value: {{ quote .Values.parametersVault.env.vaultHostname }}
-        - name: VAULT_PORT
-          value: {{ quote .Values.parametersVault.env.vaultPort }}
-        - name: VAULT_ACCESS_TOKEN
-          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
-        image: {{ .Values.CapifClient.image.repository }}:{{ .Values.CapifClient.image.tag | default .Chart.AppVersion }}
-        imagePullPolicy: {{ .Values.CapifClient.image.imagePullPolicy }}
-        name: capif-client
-        resources:
-            {{- toYaml .Values.CapifClient.resources | nindent 12 }}
-      restartPolicy: Always
-{{- end }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: access-control-policy
-  labels:
-    io.kompose.service: access-control-policy
-  {{- include "capif.labels" . | nindent 4 }}
-  annotations:
-    kompose.cmd: kompose -f ../services/docker-compose.yml convert
-spec:
-  replicas: {{ .Values.accessControlPolicy.replicas }}
-  selector:
-    matchLabels:
-      io.kompose.service: access-control-policy
-    {{- include "capif.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        io.kompose.network/services-default: "true"
-        io.kompose.service: access-control-policy
-      {{- include "capif.selectorLabels" . | nindent 8 }}
-      annotations:
-        date: "{{  now | unixEpoch }}"
-    spec:
-      hostAliases:
-        - ip: "{{ .Values.ingress.ip }}"
-          hostnames:
-            - "{{ .Values.nginx.nginx.env.capifHostname }}"
-      containers:
-      - env:
-        - name: CAPIF_HOSTNAME
-          value: {{ quote .Values.nginx.nginx.env.capifHostname }}
-        - name: MONITORING
-          value: {{ quote .Values.accessControlPolicy.env.monitoring }}
-        image: {{ .Values.accessControlPolicy.image.repository }}:{{ .Values.accessControlPolicy.image.tag | default .Chart.AppVersion }}
-        imagePullPolicy: {{ .Values.accessControlPolicy.image.imagePullPolicy }}
-        name: access-control-policy
-        ports:
-        - containerPort: 8080
-        resources:
-            {{- toYaml .Values.accessControlPolicy.resources | nindent 12 }}
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 10
-          periodSeconds: 5
-      restartPolicy: Always
-
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/helm/capif/values.yaml b/helm/capif/values.yaml
index f017ac0f..0a507822 100644
--- a/helm/capif/values.yaml
+++ b/helm/capif/values.yaml
@@ -34,31 +34,6 @@ accessControlPolicy:
   replicas: 1
   type: ClusterIP
 
-CapifClient:
-  # -- If enable capif client.
-  enable: ""
-  image:
-      # -- The docker image repository to use
-      repository: "public.ecr.aws/o2v4a8t6/opencapif/client"
-      # -- The docker image tag to use
-      # @default Chart version
-      tag: ""
-      # -- Image pull policy: Always, IfNotPresent
-      imagePullPolicy: Always
-  resources:
-    limits:
-      cpu: 100m
-      memory: 128Mi
-    requests:
-      cpu: 100m
-      memory: 128Mi
-  ports:
-  - name: "8080"
-    port: 8080
-    targetPort: 8080
-  replicas: 1
-  type: ClusterIP
-
 apiInvocationLogs:
   apiInvocationLogs:
     image:
-- 
GitLab