From 699c8856144ef2d5391888a73852c1054cd9d526 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 12:32:47 +0200 Subject: [PATCH 01/13] fist commit helper --- .gitignore | 2 +- helm/capif/Chart.yaml | 1 + helm/capif/charts/helper/.helmignore | 23 ++++ helm/capif/charts/helper/Chart.yaml | 24 ++++ helm/capif/charts/helper/templates/NOTES.txt | 22 ++++ .../charts/helper/templates/_helpers.tpl | 62 +++++++++ .../charts/helper/templates/deployment.yaml | 76 +++++++++++ helm/capif/charts/helper/templates/hpa.yaml | 32 +++++ .../charts/helper/templates/ingress.yaml | 61 +++++++++ .../templates/ocf-helper-configmap.yaml | 24 ++++ .../charts/helper/templates/service.yaml | 15 +++ .../helper/templates/serviceaccount.yaml | 13 ++ .../templates/tests/test-connection.yaml | 15 +++ helm/capif/charts/helper/values.yaml | 119 ++++++++++++++++++ helm/capif/values.yaml | 12 ++ 15 files changed, 500 insertions(+), 1 deletion(-) create mode 100644 helm/capif/charts/helper/.helmignore create mode 100644 helm/capif/charts/helper/Chart.yaml create mode 100644 helm/capif/charts/helper/templates/NOTES.txt create mode 100644 helm/capif/charts/helper/templates/_helpers.tpl create mode 100644 helm/capif/charts/helper/templates/deployment.yaml create mode 100644 helm/capif/charts/helper/templates/hpa.yaml create mode 100644 helm/capif/charts/helper/templates/ingress.yaml create mode 100644 helm/capif/charts/helper/templates/ocf-helper-configmap.yaml create mode 100644 helm/capif/charts/helper/templates/service.yaml create mode 100644 helm/capif/charts/helper/templates/serviceaccount.yaml create mode 100644 helm/capif/charts/helper/templates/tests/test-connection.yaml create mode 100644 helm/capif/charts/helper/values.yaml diff --git a/.gitignore b/.gitignore index 66e4e33..c65c28d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,4 @@ docs/testing_with_postman/package-lock.json results helm/capif/*.lock -helm/capif/charts \ No newline at end of file +helm/capif/charts/tempo* \ No newline at end of file diff --git a/helm/capif/Chart.yaml b/helm/capif/Chart.yaml index 0c8eb5f..83f8ebf 100644 --- a/helm/capif/Chart.yaml +++ b/helm/capif/Chart.yaml @@ -24,3 +24,4 @@ dependencies: condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" version: "^1.3.1" + - name: helper diff --git a/helm/capif/charts/helper/.helmignore b/helm/capif/charts/helper/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/helm/capif/charts/helper/.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/helper/Chart.yaml b/helm/capif/charts/helper/Chart.yaml new file mode 100644 index 0000000..4ddfbf3 --- /dev/null +++ b/helm/capif/charts/helper/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: helper +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/helper/templates/NOTES.txt b/helm/capif/charts/helper/templates/NOTES.txt new file mode 100644 index 0000000..f8f6f77 --- /dev/null +++ b/helm/capif/charts/helper/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 "helper.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 "helper.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "helper.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 "helper.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/helper/templates/_helpers.tpl b/helm/capif/charts/helper/templates/_helpers.tpl new file mode 100644 index 0000000..f4a197b --- /dev/null +++ b/helm/capif/charts/helper/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "helper.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 "helper.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 "helper.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "helper.labels" -}} +helm.sh/chart: {{ include "helper.chart" . }} +{{ include "helper.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "helper.selectorLabels" -}} +app.kubernetes.io/name: {{ include "helper.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "helper.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "helper.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm/capif/charts/helper/templates/deployment.yaml b/helm/capif/charts/helper/templates/deployment.yaml new file mode 100644 index 0000000..a3f43d3 --- /dev/null +++ b/helm/capif/charts/helper/templates/deployment.yaml @@ -0,0 +1,76 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "helper.fullname" . }} + labels: + {{- include "helper.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "helper.selectorLabels" . | nindent 6 }} + template: + metadata: + annotations: + date: "{{ now | unixEpoch }}" + checksum/config: {{ include (print $.Template.BasePath "/ocf-helper-configmap.yaml") . | sha256sum }} + labels: + {{- include "helper.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "helper.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 + 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 }} + env: + - name: CAPIF_HOSTNAME + value: {{ quote .Values.env.capifHostname }} + - name: VAULT_HOSTNAME + value: {{ quote .Values.env.vaultHostname }} + - name: VAULT_PORT + value: {{ quote .Values.env.vaultPort }} + - name: VAULT_ACCESS_TOKEN + value: {{ quote .Values.env.vaultAccessToken }} + {{- 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/helper/templates/hpa.yaml b/helm/capif/charts/helper/templates/hpa.yaml new file mode 100644 index 0000000..046148d --- /dev/null +++ b/helm/capif/charts/helper/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "helper.fullname" . }} + labels: + {{- include "helper.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "helper.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/helper/templates/ingress.yaml b/helm/capif/charts/helper/templates/ingress.yaml new file mode 100644 index 0000000..b3817bf --- /dev/null +++ b/helm/capif/charts/helper/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "helper.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 "helper.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/helper/templates/ocf-helper-configmap.yaml b/helm/capif/charts/helper/templates/ocf-helper-configmap.yaml new file mode 100644 index 0000000..796a55c --- /dev/null +++ b/helm/capif/charts/helper/templates/ocf-helper-configmap.yaml @@ -0,0 +1,24 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: ocf-helper-configmap +data: + config.yaml: | + mongo: { + 'user': '{{ .Values.env.mongoInitdbRootUsername }}', + 'password': '{{ .Values.env.mongoInitdbRootPassword }}', + 'db': 'capif', + 'invoker_col': 'invokerdetails', + 'provider_col': 'providerenrolmentdetails', + 'col_services': "serviceapidescriptions", + 'col_security': "security", + 'col_event': "eventsdetails", + 'host': '{{ .Values.env.mongoHost }}', + 'port': "{{ .Values.env.mongoPort }}" + } + + ca_factory: { + "url": {{ quote .Values.env.vaultHostname }}, + "port": {{ quote .Values.env.vaultPort }}, + "token": {{ quote .Values.env.vaultAccessToken }} + } \ No newline at end of file diff --git a/helm/capif/charts/helper/templates/service.yaml b/helm/capif/charts/helper/templates/service.yaml new file mode 100644 index 0000000..4a74370 --- /dev/null +++ b/helm/capif/charts/helper/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: helper + labels: + {{- include "helper.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "helper.selectorLabels" . | nindent 4 }} diff --git a/helm/capif/charts/helper/templates/serviceaccount.yaml b/helm/capif/charts/helper/templates/serviceaccount.yaml new file mode 100644 index 0000000..e0e6d79 --- /dev/null +++ b/helm/capif/charts/helper/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "helper.serviceAccountName" . }} + labels: + {{- include "helper.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/helm/capif/charts/helper/templates/tests/test-connection.yaml b/helm/capif/charts/helper/templates/tests/test-connection.yaml new file mode 100644 index 0000000..f3959cc --- /dev/null +++ b/helm/capif/charts/helper/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "helper.fullname" . }}-test-connection" + labels: + {{- include "helper.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "helper.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml new file mode 100644 index 0000000..55d7821 --- /dev/null +++ b/helm/capif/charts/helper/values.yaml @@ -0,0 +1,119 @@ +# Default values for helper. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: "helper" + pullPolicy: Always + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +env: + vaultHostname: vault-internal.mon.svc.cluster.local + vaultPort: 8200 + vaultAccessToken: dev-only-token + mongoHost: mongo + mongoPort: 27017 + capifHostname: capif + mongoInitdbRootUsername: root + mongoInitdbRootPassword: example + +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: + app: ocf-helper + +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: + httpGet: + path: / + port: http + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: + - name: ocf-helper-configmap + items: + - key: config.yaml + path: config.yaml + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: + - name: ocf-helper-configmap + mountPath: "/usr/src/app/config.yaml" + subPath: config.yaml + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/helm/capif/values.yaml b/helm/capif/values.yaml index 8b9a920..f017ac0 100644 --- a/helm/capif/values.yaml +++ b/helm/capif/values.yaml @@ -523,6 +523,18 @@ parametersVault: vaultHostname: vault-internal.mon.svc.cluster.local vaultPort: 8200 vaultAccessToken: dev-only-token + +helper: + env: + vaultHostname: vault-internal.mon.svc.cluster.local + vaultPort: 8200 + vaultAccessToken: dev-only-token + mongoHost: mongo + mongoPort: 27017 + capifHostname: my-capif.apps.ocp-epg.hi.inet + mongoInitdbRootUsername: root + mongoInitdbRootPassword: example + # -- With tempo.enabled: false. It won't be deployed # -- If monitoring.enable: "true". Also enable tempo.enabled: true tempo: -- GitLab From afc2e11af5894b010da99b2884f280ac7afd327d Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 12:38:24 +0200 Subject: [PATCH 02/13] helm/capif/charts/helper/Chart.yaml --- helm/capif/charts/helper/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index 55d7821..4fad2c7 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -116,4 +116,4 @@ nodeSelector: {} tolerations: [] -affinity: {} +affinity: {} \ No newline at end of file -- GitLab From 00870c22b403f5afb733c9ad8a1d511262d925ca Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 12:42:09 +0200 Subject: [PATCH 03/13] - name: helper --- helm/capif/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/Chart.yaml b/helm/capif/Chart.yaml index 83f8ebf..a9699ed 100644 --- a/helm/capif/Chart.yaml +++ b/helm/capif/Chart.yaml @@ -20,8 +20,8 @@ version: v3.1.6 # It is recommended to use it with quotes. appVersion: "v3.1.6" dependencies: + - name: helper - name: "tempo" condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" version: "^1.3.1" - - name: helper -- GitLab From c8e10f2e7f81d7808172dc4182602a385edacb69 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 12:46:42 +0200 Subject: [PATCH 04/13] version helper charts --- helm/capif/Chart.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm/capif/Chart.yaml b/helm/capif/Chart.yaml index a9699ed..fc0c967 100644 --- a/helm/capif/Chart.yaml +++ b/helm/capif/Chart.yaml @@ -21,6 +21,7 @@ version: v3.1.6 appVersion: "v3.1.6" dependencies: - name: helper + version: "*" - name: "tempo" condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" -- GitLab From 0163299aa5a4dd1660b4a6716ffca90f1eee8c1a Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 13:01:34 +0200 Subject: [PATCH 05/13] volume --- helm/capif/charts/helper/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index 4fad2c7..8e53f32 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -103,13 +103,13 @@ autoscaling: volumes: - name: ocf-helper-configmap items: - - key: config.yaml - path: config.yaml + - key: "config.yaml" + path: "config.yaml" # Additional volumeMounts on the output Deployment definition. volumeMounts: - name: ocf-helper-configmap - mountPath: "/usr/src/app/config.yaml" + mountPath: /usr/src/app/config.yaml subPath: config.yaml nodeSelector: {} -- GitLab From 87215cc00c7c92fe8b18f1d8d123c56d8826a16c Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 13:41:25 +0200 Subject: [PATCH 06/13] no volumes --- helm/capif/charts/helper/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index 8e53f32..d759b26 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -100,17 +100,17 @@ autoscaling: # targetMemoryUtilizationPercentage: 80 # Additional volumes on the output Deployment definition. -volumes: - - name: ocf-helper-configmap - items: - - key: "config.yaml" - path: "config.yaml" +volumes: [] +# - name: ocf-helper-configmap +# items: +# - key: "config.yaml" +# path: "config.yaml" # Additional volumeMounts on the output Deployment definition. -volumeMounts: - - name: ocf-helper-configmap - mountPath: /usr/src/app/config.yaml - subPath: config.yaml +volumeMounts: [] +# - name: ocf-helper-configmap +# mountPath: /usr/src/app/config.yaml +# subPath: config.yaml nodeSelector: {} -- GitLab From ed79878201a2ffc67960a5d27f9fefb2cadb356d Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 13:48:03 +0200 Subject: [PATCH 07/13] volumes --- helm/capif/charts/helper/values.yaml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index d759b26..d631818 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -100,17 +100,19 @@ autoscaling: # targetMemoryUtilizationPercentage: 80 # Additional volumes on the output Deployment definition. -volumes: [] -# - name: ocf-helper-configmap -# items: -# - key: "config.yaml" -# path: "config.yaml" +volumes: + - name: ocf-helper-configmap + configMap: + name: ocf-helper-configmap + items: + - key: "config.yaml" + path: "config.yaml" # Additional volumeMounts on the output Deployment definition. -volumeMounts: [] -# - name: ocf-helper-configmap -# mountPath: /usr/src/app/config.yaml -# subPath: config.yaml +volumeMounts: + - name: ocf-helper-configmap + mountPath: /usr/src/app/config.yaml + subPath: config.yaml nodeSelector: {} -- GitLab From 3cfa7f37ee12eaef3b34dc0a3583c365b8af3e37 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 13:51:48 +0200 Subject: [PATCH 08/13] trigger --- helm/capif/charts/helper/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index d631818..fce1936 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -118,4 +118,4 @@ nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} -- GitLab From da44322d2fcefa09e5ee54f4dcc242baa5cf567e Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 13:58:04 +0200 Subject: [PATCH 09/13] live and read probe --- helm/capif/charts/helper/values.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index fce1936..147c003 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -84,13 +84,11 @@ resources: {} # memory: 128Mi livenessProbe: - httpGet: - path: / - port: http + tcpSocket: + port: 8080 readinessProbe: - httpGet: - path: / - port: http + tcpSocket: + port: 8080 autoscaling: enabled: false -- GitLab From af0d4883a1dcac23505fae5307b6f47b481e2ffe Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 14:05:43 +0200 Subject: [PATCH 10/13] dict register --- helm/capif/templates/register-configmap.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helm/capif/templates/register-configmap.yaml b/helm/capif/templates/register-configmap.yaml index 51293a5..7dcc300 100644 --- a/helm/capif/templates/register-configmap.yaml +++ b/helm/capif/templates/register-configmap.yaml @@ -18,4 +18,10 @@ data: "url": "{{ .Values.parametersVault.env.vaultHostname }}", "port": "{{ .Values.parametersVault.env.vaultPort }}", "token": "{{ .Values.parametersVault.env.vaultAccessToken }}" + } + register: { + register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8', + refresh_expiration: 30, #days + token_expiration: 10, #mins + admin_users: {admin: "password123"} } \ No newline at end of file -- GitLab From 397727fc76384a57ae85f751b3ac97e63ea785ae Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 15:20:38 +0200 Subject: [PATCH 11/13] trigger --- helm/capif/charts/helper/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index 147c003..389f212 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -116,4 +116,4 @@ nodeSelector: {} tolerations: [] -affinity: {} +affinity: {} \ No newline at end of file -- GitLab From c00b2479557b402da1ce83ecf2e292bf2ce96e65 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 15:40:53 +0200 Subject: [PATCH 12/13] trigger --- helm/capif/charts/helper/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/charts/helper/values.yaml b/helm/capif/charts/helper/values.yaml index 389f212..147c003 100644 --- a/helm/capif/charts/helper/values.yaml +++ b/helm/capif/charts/helper/values.yaml @@ -116,4 +116,4 @@ nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} -- GitLab From 67429e5ebb4c9031f127b0784ce7970594e5216e Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Tue, 4 Jun 2024 15:55:52 +0200 Subject: [PATCH 13/13] ReadWriteMany --- helm/capif/templates/mongo-register-pvc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/templates/mongo-register-pvc.yaml b/helm/capif/templates/mongo-register-pvc.yaml index 4d1a259..b5a11d6 100644 --- a/helm/capif/templates/mongo-register-pvc.yaml +++ b/helm/capif/templates/mongo-register-pvc.yaml @@ -9,7 +9,7 @@ metadata: spec: storageClassName: {{ .Values.mongoRegister.mongo.persistence.storageClass }} accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: {{ .Values.mongoRegister.mongo.persistence.storage }} -- GitLab