From dec68753ee26db41914c446164ea948a7a28aa34 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Mon, 30 Oct 2023 08:14:04 +0100 Subject: [PATCH] Updated structure --- .../test/templates/applications.yaml | 11 +- argocd/app-of-apps/test/values.yaml | 62 ++----- argocd/configserver/test/Chart.lock | 6 + argocd/configserver/test/Chart.yaml | 8 + argocd/configserver/test/default_values.yaml | 1 + .../configserver/test/overwrite_values.yaml | 4 + argocd/configserver/test/templates | 1 + argocd/configserver/test/values.yaml | 152 ++++++++++++++++ argocd/kafka/test/Chart.lock | 6 + argocd/kafka/test/Chart.yaml | 8 + argocd/kafka/test/default_values.yaml | 1 + argocd/kafka/test/overwrite_values.yaml | 2 + argocd/kafka/test/templates | 1 + argocd/kafka/test/values.yaml | 149 ++++++++++++++++ argocd/vault-secrets-operator/test/Chart.lock | 6 + argocd/vault-secrets-operator/test/Chart.yaml | 8 + .../test/argocd_values.yaml | 0 argocd/wahlrecht/test/Chart.lock | 6 + argocd/wahlrecht/test/Chart.yaml | 8 + argocd/wahlrecht/test/default_values.yaml | 1 + argocd/wahlrecht/test/overwrite_values.yaml | 30 ++++ argocd/wahlrecht/test/templates | 1 + argocd/wahlrecht/test/values.yaml | 163 ++++++++++++++++++ argocd/zookeeper/test/Chart.lock | 6 + argocd/zookeeper/test/Chart.yaml | 8 + argocd/zookeeper/test/default_values.yaml | 1 + argocd/zookeeper/test/overwrite_values.yaml | 2 + argocd/zookeeper/test/templates | 1 + argocd/zookeeper/test/values.yaml | 137 +++++++++++++++ helm/wahlrecht/overwrite_values.yaml | 10 -- helm/wahlrecht/values.yaml | 11 -- 31 files changed, 734 insertions(+), 77 deletions(-) create mode 100644 argocd/configserver/test/Chart.lock create mode 100644 argocd/configserver/test/Chart.yaml create mode 120000 argocd/configserver/test/default_values.yaml create mode 100644 argocd/configserver/test/overwrite_values.yaml create mode 120000 argocd/configserver/test/templates create mode 100644 argocd/configserver/test/values.yaml create mode 100644 argocd/kafka/test/Chart.lock create mode 100644 argocd/kafka/test/Chart.yaml create mode 120000 argocd/kafka/test/default_values.yaml create mode 100644 argocd/kafka/test/overwrite_values.yaml create mode 120000 argocd/kafka/test/templates create mode 100644 argocd/kafka/test/values.yaml create mode 100644 argocd/vault-secrets-operator/test/Chart.lock create mode 100644 argocd/vault-secrets-operator/test/Chart.yaml create mode 100644 argocd/vault-secrets-operator/test/argocd_values.yaml create mode 100644 argocd/wahlrecht/test/Chart.lock create mode 100644 argocd/wahlrecht/test/Chart.yaml create mode 120000 argocd/wahlrecht/test/default_values.yaml create mode 100644 argocd/wahlrecht/test/overwrite_values.yaml create mode 120000 argocd/wahlrecht/test/templates create mode 100644 argocd/wahlrecht/test/values.yaml create mode 100644 argocd/zookeeper/test/Chart.lock create mode 100644 argocd/zookeeper/test/Chart.yaml create mode 120000 argocd/zookeeper/test/default_values.yaml create mode 100644 argocd/zookeeper/test/overwrite_values.yaml create mode 120000 argocd/zookeeper/test/templates create mode 100644 argocd/zookeeper/test/values.yaml diff --git a/argocd/app-of-apps/test/templates/applications.yaml b/argocd/app-of-apps/test/templates/applications.yaml index 427d401..2c2cf9e 100644 --- a/argocd/app-of-apps/test/templates/applications.yaml +++ b/argocd/app-of-apps/test/templates/applications.yaml @@ -18,10 +18,13 @@ spec: source: repoURL: {{ .repoURL }} targetRevision: {{ .targetRevision }} + {{- if .repoURL | contains "git" }} + path: argocd/{{ .name }}/{{ $.Values.overall.environment }} + {{- else }} chart: {{ .name }} - {{- if .values }} - helm: - values: | - {{- toYaml .values | nindent 8 }} {{- end }} + helm: + ignoreMissingValueFiles: true + valueFiles: + - argocd_values.yaml {{- end }} diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml index 6253b72..5deea8e 100644 --- a/argocd/app-of-apps/test/values.yaml +++ b/argocd/app-of-apps/test/values.yaml @@ -1,76 +1,34 @@ applications: - name: configserver project: default - targetRevision: 0.1.18 + targetRevision: main namespace: spring-support createNamespace: true - repoURL: https://repo.2martens.de/charts - values: - application: - kafka: - host: kafka.kafka - port: 9092 + repoURL: https://git.2martens.de/2martens/cloud-configuration.git - name: kafka project: default - targetRevision: x + targetRevision: main namespace: kafka createNamespace: true - repoURL: https://repo.2martens.de/charts - values: - image: - tag: 7.5.1 + repoURL: https://git.2martens.de/2martens/cloud-configuration.git - name: zookeeper project: default - targetRevision: x + targetRevision: main namespace: kafka createNamespace: false - repoURL: https://repo.2martens.de/charts - values: - image: - tag: 7.5.1 + repoURL: https://git.2martens.de/2martens/cloud-configuration.git - name: wahlrecht project: default - targetRevision: x + targetRevision: main namespace: wahlrecht createNamespace: true - repoURL: https://repo.2martens.de/charts - values: - image: - tag: 0.2.11 - ingress: - enabled: true - className: public - hosts: - - host: api.2martens.de - paths: - - path: /wahlrecht/ - pathType: Prefix - tls: - - secretName: wahlrecht-tls - hosts: - - api.2martens.de - resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 200m - memory: 128Mi - application: - configserver: - scheme: http - host: configserver.spring-support - port: 8888 - prefix: /config - kafka: - host: kafka.kafka - port: 9092 + repoURL: https://git.2martens.de/2martens/cloud-configuration.git - name: vault-secrets-operator project: default - targetRevision: x + targetRevision: main namespace: vault-secrets-operator-system createNamespace: true - repoURL: https://helm.releases.hashicorp.com + repoURL: https://git.2martens.de/2martens/cloud-configuration.git overall: destinationServer: https://kubernetes.default.svc diff --git a/argocd/configserver/test/Chart.lock b/argocd/configserver/test/Chart.lock new file mode 100644 index 0000000..e46dff8 --- /dev/null +++ b/argocd/configserver/test/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: template + repository: https://repo.2martens.de/charts + version: 0.1.15 +digest: sha256:8bc1d4b964e7455327efb4bce13a28674488b324e69085e18850f4037b03e5c0 +generated: "2023-10-30T07:49:45.663723+01:00" diff --git a/argocd/configserver/test/Chart.yaml b/argocd/configserver/test/Chart.yaml new file mode 100644 index 0000000..356446c --- /dev/null +++ b/argocd/configserver/test/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: configserver +version: 0.1.0 +type: application +dependencies: + - name: template + version: 0.1.15 + repository: https://repo.2martens.de/charts diff --git a/argocd/configserver/test/default_values.yaml b/argocd/configserver/test/default_values.yaml new file mode 120000 index 0000000..5cd56eb --- /dev/null +++ b/argocd/configserver/test/default_values.yaml @@ -0,0 +1 @@ +../../../helm/configserver/values.yaml \ No newline at end of file diff --git a/argocd/configserver/test/overwrite_values.yaml b/argocd/configserver/test/overwrite_values.yaml new file mode 100644 index 0000000..935a125 --- /dev/null +++ b/argocd/configserver/test/overwrite_values.yaml @@ -0,0 +1,4 @@ +application: + kafka: + host: kafka.kafka + port: 9092 \ No newline at end of file diff --git a/argocd/configserver/test/templates b/argocd/configserver/test/templates new file mode 120000 index 0000000..18b9889 --- /dev/null +++ b/argocd/configserver/test/templates @@ -0,0 +1 @@ +../../../helm/configserver/templates \ No newline at end of file diff --git a/argocd/configserver/test/values.yaml b/argocd/configserver/test/values.yaml new file mode 100644 index 0000000..bdac2e9 --- /dev/null +++ b/argocd/configserver/test/values.yaml @@ -0,0 +1,152 @@ +# Copy these values to your application chart completely and then modify those bits where +# the default for your application differs. The image.repository is a prime candidate for that. + +replicaCount: 1 +image: + repository: 2martens/configserver + pullPolicy: IfNotPresent + # Overrides the image tag whose default is latest + tag: "0.1.17" +# If image is not accessible for Kubernetes without authentication, configure required secrets here +# will be added verbatim to imagePullSecrets in deployment pod template +imagePullSecrets: [] +# Overrides the name being used in, for example, annotations +# by default it is the chart name +nameOverride: "" +# Overrides the name being used for the name of Kubernetes resources +# by default release name if it contains the chart name, otherwise releaseName-chartName +fullnameOverride: "" +serviceAccount: + # Specifies whether a service account should be created + create: 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: "" +# Configure annotations for the pod, will be added verbatim to key annotations in pod metadata +podAnnotations: {} +# Configure the security context of the application pod +podSecurityContext: {} +# fsGroup: 2000 + +# Configure security context of the application container +securityContext: {} +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 + +application: + port: &applicationPort 8888 + actuatorPort: &actuatorPort 13000 + namespace: template # update to match the desired namespace + profile: prod + isSpring: true + prefix: /config + repositoryPath: "https://git.2martens.de/2martens/{application}" + searchPath: module-server/src/main/resources/config + kafka: + host: kafka.kafka + port: 9092 +# Overwrite with application specific environment variables +# Each item has key and value, where the value is parsed as a template +environment: + - name: PORT + value: "{{ .Values.application.port }}" + - name: ACTUATOR_PORT + value: "{{ .Values.application.actuatorPort }}" + - name: PREFIX + value: "{{ .Values.application.prefix }}" + - name: REPOSITORY_PATH + value: "{{ .Values.application.repositoryPath }}" + - name: SEARCH_PATH + value: "{{ .Values.application.searchPath }}" + - name: KAFKA_HOST + value: "{{ .Values.application.kafka.host }}" + - name: KAFKA_PORT + value: "{{ .Values.application.kafka.port }}" +enableServiceLinks: false +# Contents of this object will be added to a Kubernetes secret data section and Base64 encoded +# External secrets are not supported by this template +secrets: {} +# Configure the service +service: + type: ClusterIP + # port is targeting the containerPort http, described by application.port + port: *applicationPort + # actuatorPort is targeting the containerPort http-actuator, described by application.actuatorPort + # only used if application.isSpring=true + actuatorPort: *actuatorPort +# Configure the liveness probe +# Defaults fitting for Spring Boot application that has livenessProbe enabled +livenessProbe: + enabled: true + path: /actuator/health/liveness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 120 +# Configure the readiness probe +# Defaults fitting for Spring Boot application that has readinessProbe enabled +readinessProbe: + enabled: true + path: /actuator/health/readiness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 10 + # Allows you to specify the number of seconds the application can take to answer readinessProbe + # before failure is assumed by Kubernetes + timeoutSeconds: 1 +# Configure ingress if desired (exposing app beyond the boundaries of the cluster) +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: + - secretName: chart-example-tls + hosts: + - chart-example.local +resources: {} +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi + +# Configure autoscaling +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 +# Configure nodeSelector, contents will be added verbatim to key nodeSelector in deployment pod template +nodeSelector: {} +# Configure tolerations, contents will be added verbatim to key tolerations in deployment pod template +tolerations: [] +# Configure affinity, contents will be added verbatim to key affinity in deployment pod template +affinity: {} +# podSpec: will be added at the bottom of the pod template in the deployment +podSpec: {} +# containerSpec: will be added at the bottom of the container specification in the pod template +containerSpec: {} +argocd: + enabled: false + project: default + repoURL: https://github.com/exampleUser/exampleRepo + targetRevision: HEAD + # pathInRepo: is required if it is a git repo + pathInRepo: / + # chartName: required if repo is a Helm chart repo + chartName: "" + # targetCluster: specifies the cluster to deploy to + targetCluster: https://kubernetes.default.svc diff --git a/argocd/kafka/test/Chart.lock b/argocd/kafka/test/Chart.lock new file mode 100644 index 0000000..e58eadb --- /dev/null +++ b/argocd/kafka/test/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: template + repository: https://repo.2martens.de/charts + version: 0.1.15 +digest: sha256:8bc1d4b964e7455327efb4bce13a28674488b324e69085e18850f4037b03e5c0 +generated: "2023-10-30T07:58:18.809212+01:00" diff --git a/argocd/kafka/test/Chart.yaml b/argocd/kafka/test/Chart.yaml new file mode 100644 index 0000000..f7173f1 --- /dev/null +++ b/argocd/kafka/test/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: kafka +version: 0.1.0 +type: application +dependencies: + - name: template + version: 0.1.15 + repository: https://repo.2martens.de/charts diff --git a/argocd/kafka/test/default_values.yaml b/argocd/kafka/test/default_values.yaml new file mode 120000 index 0000000..879b683 --- /dev/null +++ b/argocd/kafka/test/default_values.yaml @@ -0,0 +1 @@ +../../../helm/kafka/values.yaml \ No newline at end of file diff --git a/argocd/kafka/test/overwrite_values.yaml b/argocd/kafka/test/overwrite_values.yaml new file mode 100644 index 0000000..eec7f10 --- /dev/null +++ b/argocd/kafka/test/overwrite_values.yaml @@ -0,0 +1,2 @@ +image: + tag: 7.5.1 \ No newline at end of file diff --git a/argocd/kafka/test/templates b/argocd/kafka/test/templates new file mode 120000 index 0000000..84ac06f --- /dev/null +++ b/argocd/kafka/test/templates @@ -0,0 +1 @@ +../../../helm/kafka/templates \ No newline at end of file diff --git a/argocd/kafka/test/values.yaml b/argocd/kafka/test/values.yaml new file mode 100644 index 0000000..9be2cb6 --- /dev/null +++ b/argocd/kafka/test/values.yaml @@ -0,0 +1,149 @@ +# Copy these values to your application chart completely and then modify those bits where +# the default for your application differs. The image.repository is a prime candidate for that. + +replicaCount: 1 +image: + repository: confluentinc/cp-kafka + pullPolicy: IfNotPresent + # Overrides the image tag whose default is latest + tag: "7.5.1" +# If image is not accessible for Kubernetes without authentication, configure required secrets here +# will be added verbatim to imagePullSecrets in deployment pod template +imagePullSecrets: [] +# Overrides the name being used in, for example, annotations +# by default it is the chart name +nameOverride: "" +# Overrides the name being used for the name of Kubernetes resources +# by default release name if it contains the chart name, otherwise releaseName-chartName +fullnameOverride: "" +serviceAccount: + # Specifies whether a service account should be created + create: 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: "" +# Configure annotations for the pod, will be added verbatim to key annotations in pod metadata +podAnnotations: {} +# Configure the security context of the application pod +podSecurityContext: {} +# fsGroup: 2000 + +# Configure security context of the application container +securityContext: {} +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 + +application: + port: &applicationPort 9092 + actuatorPort: 8081 + namespace: template # update to match the desired namespace + profile: prod + isSpring: false + zookeeper: + host: zookeeper + port: 2181 +# Overwrite with application specific environment variables +# Each item has key and value, where the value is parsed as a template +environment: + - name: KAFKA_BROKER_ID + value: "1" + - name: KAFKA_ZOOKEEPER_CONNECT + value: "{{ .Values.application.zookeeper.host }}:{{ .Values.application.zookeeper.port }}" + - name: KAFKA_LISTENERS + value: "PLAINTEXT://0.0.0.0:{{ .Values.application.port }}" + - name: KAFKA_ADVERTISED_LISTENERS + value: "PLAINTEXT://kafka:{{ .Values.application.port }}" + - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP + value: PLAINTEXT:PLAINTEXT + - name: KAFKA_INTER_BROKER_LISTENER_NAME + value: PLAINTEXT + - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR + value: "1" +enableServiceLinks: false +# Contents of this object will be added to a Kubernetes secret data section and Base64 encoded +# External secrets are not supported by this template +secrets: {} +# Configure the service +service: + type: ClusterIP + # port is targeting the containerPort http, described by application.port + port: *applicationPort + # actuatorPort is targeting the containerPort http-actuator, described by application.actuatorPort + # only used if application.isSpring=true + actuatorPort: 8081 +# Configure the liveness probe +# Defaults fitting for Spring Boot application that has livenessProbe enabled +livenessProbe: + enabled: false + path: /actuator/health/liveness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 120 +# Configure the readiness probe +# Defaults fitting for Spring Boot application that has readinessProbe enabled +readinessProbe: + enabled: false + path: /actuator/health/readiness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 10 + # Allows you to specify the number of seconds the application can take to answer readinessProbe + # before failure is assumed by Kubernetes + timeoutSeconds: 1 +# Configure ingress if desired (exposing app beyond the boundaries of the cluster) +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: + - secretName: chart-example-tls + hosts: + - chart-example.local +resources: {} +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi + +# Configure autoscaling +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 +# Configure nodeSelector, contents will be added verbatim to key nodeSelector in deployment pod template +nodeSelector: {} +# Configure tolerations, contents will be added verbatim to key tolerations in deployment pod template +tolerations: [] +# Configure affinity, contents will be added verbatim to key affinity in deployment pod template +affinity: {} +# podSpec: will be added at the bottom of the pod template in the deployment +podSpec: {} +# containerSpec: will be added at the bottom of the container specification in the pod template +containerSpec: {} +argocd: + enabled: false + project: default + repoURL: https://github.com/exampleUser/exampleRepo + targetRevision: HEAD + # pathInRepo: is required if it is a git repo + pathInRepo: / + # chartName: required if repo is a Helm chart repo + chartName: "" + # targetCluster: specifies the cluster to deploy to + targetCluster: https://kubernetes.default.svc diff --git a/argocd/vault-secrets-operator/test/Chart.lock b/argocd/vault-secrets-operator/test/Chart.lock new file mode 100644 index 0000000..7fda178 --- /dev/null +++ b/argocd/vault-secrets-operator/test/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: vault-secrets-operator + repository: https://helm.releases.hashicorp.com + version: 0.3.4 +digest: sha256:31a1abfdb72e2bbda888425b359389c93ae44e9f614e28e227181e69a0af08a7 +generated: "2023-10-30T08:00:53.563388+01:00" diff --git a/argocd/vault-secrets-operator/test/Chart.yaml b/argocd/vault-secrets-operator/test/Chart.yaml new file mode 100644 index 0000000..b5c419c --- /dev/null +++ b/argocd/vault-secrets-operator/test/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: kafka +version: 0.1.0 +type: application +dependencies: + - name: vault-secrets-operator + version: 0.3.4 + repository: https://helm.releases.hashicorp.com diff --git a/argocd/vault-secrets-operator/test/argocd_values.yaml b/argocd/vault-secrets-operator/test/argocd_values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/argocd/wahlrecht/test/Chart.lock b/argocd/wahlrecht/test/Chart.lock new file mode 100644 index 0000000..5b67e31 --- /dev/null +++ b/argocd/wahlrecht/test/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: template + repository: https://repo.2martens.de/charts + version: 0.1.15 +digest: sha256:8bc1d4b964e7455327efb4bce13a28674488b324e69085e18850f4037b03e5c0 +generated: "2023-10-30T08:11:30.233504+01:00" diff --git a/argocd/wahlrecht/test/Chart.yaml b/argocd/wahlrecht/test/Chart.yaml new file mode 100644 index 0000000..8371546 --- /dev/null +++ b/argocd/wahlrecht/test/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: wahlrecht +version: 0.1.0 +type: application +dependencies: + - name: template + version: 0.1.15 + repository: https://repo.2martens.de/charts diff --git a/argocd/wahlrecht/test/default_values.yaml b/argocd/wahlrecht/test/default_values.yaml new file mode 120000 index 0000000..fcbfe3a --- /dev/null +++ b/argocd/wahlrecht/test/default_values.yaml @@ -0,0 +1 @@ +../../../helm/wahlrecht/values.yaml \ No newline at end of file diff --git a/argocd/wahlrecht/test/overwrite_values.yaml b/argocd/wahlrecht/test/overwrite_values.yaml new file mode 100644 index 0000000..62bf1b1 --- /dev/null +++ b/argocd/wahlrecht/test/overwrite_values.yaml @@ -0,0 +1,30 @@ +image: + tag: 0.2.11 +ingress: + enabled: true + className: public + hosts: + - host: api.2martens.de + paths: + - path: /wahlrecht/ + pathType: Prefix + tls: + - secretName: wahlrecht-tls + hosts: + - api.2martens.de +resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 200m + memory: 128Mi +application: + configserver: + scheme: http + host: configserver.spring-support + port: 8888 + prefix: /config + kafka: + host: kafka.kafka + port: 9092 \ No newline at end of file diff --git a/argocd/wahlrecht/test/templates b/argocd/wahlrecht/test/templates new file mode 120000 index 0000000..c264ad2 --- /dev/null +++ b/argocd/wahlrecht/test/templates @@ -0,0 +1 @@ +../../../helm/wahlrecht/templates \ No newline at end of file diff --git a/argocd/wahlrecht/test/values.yaml b/argocd/wahlrecht/test/values.yaml new file mode 100644 index 0000000..d156c66 --- /dev/null +++ b/argocd/wahlrecht/test/values.yaml @@ -0,0 +1,163 @@ +# Copy these values to your application chart completely and then modify those bits where +# the default for your application differs. The image.repository is a prime candidate for that. + +replicaCount: 1 +image: + repository: 2martens/wahlrecht + pullPolicy: IfNotPresent + # Overrides the image tag whose default is latest + tag: "0.2.11" +# If image is not accessible for Kubernetes without authentication, configure required secrets here +# will be added verbatim to imagePullSecrets in deployment pod template +imagePullSecrets: [] +# Overrides the name being used in, for example, annotations +# by default it is the chart name +nameOverride: "" +# Overrides the name being used for the name of Kubernetes resources +# by default release name if it contains the chart name, otherwise releaseName-chartName +fullnameOverride: "" +serviceAccount: + # Specifies whether a service account should be created + create: 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: "" +# Configure annotations for the pod, will be added verbatim to key annotations in pod metadata +podAnnotations: {} +# Configure the security context of the application pod +podSecurityContext: {} +# fsGroup: 2000 + +# Configure security context of the application container +securityContext: {} +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 + +application: + port: 12000 + actuatorPort: 12001 + namespace: template # update to match the desired namespace + profile: prod + isSpring: true + keycloak: + url: https://id.2martens.de + realm: 2martens + configserver: + scheme: http + host: configserver.spring-support + port: 8888 + prefix: /config + kafka: + host: kafka.kafka + port: 9092 +# Overwrite with application specific environment variables +# Each item has key and value, where the value is parsed as a template +environment: + - name: PORT + value: "{{ .Values.application.port }}" + - name: ACTUATOR_PORT + value: "{{ .Values.application.actuatorPort }}" + - name: KEYCLOAK_URL + value: "{{ .Values.application.keycloak.url }}" + - name: KEYCLOAK_REALM + value: "{{ .Values.application.keycloak.realm }}" + - name: CONFIGSERVER_SCHEME + value: "{{ .Values.application.configserver.scheme }}" + - name: CONFIGSERVER_HOST + value: "{{ .Values.application.configserver.host }}" + - name: CONFIGSERVER_PORT + value: "{{ .Values.application.configserver.port }}" + - name: CONFIGSERVER_PREFIX + value: "{{ .Values.application.configserver.prefix }}" + - name: KAFKA_HOST + value: "{{ .Values.application.kafka.host }}" + - name: KAFKA_PORT + value: "{{ .Values.application.kafka.port }}" +enableServiceLinks: false +# Contents of this object will be added to a Kubernetes secret data section and Base64 encoded +# External secrets are not supported by this template +secrets: + # Needs to be overwritten + MONGODB_CONNECTION_STRING: "" + # Needs to be overwritten + CLIENT_SECRET: "" +# Configure the service +service: + type: ClusterIP + # port is targeting the containerPort http, described by application.port + port: 12000 + # actuatorPort is targeting the containerPort http-actuator, described by application.actuatorPort + # only used if application.isSpring=true + actuatorPort: 12001 +# Configure the liveness probe +# Defaults fitting for Spring Boot application that has livenessProbe enabled +livenessProbe: + enabled: true + path: /actuator/health/liveness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 120 +# Configure the readiness probe +# Defaults fitting for Spring Boot application that has readinessProbe enabled +readinessProbe: + enabled: true + path: /actuator/health/readiness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 10 + # Allows you to specify the number of seconds the application can take to answer readinessProbe + # before failure is assumed by Kubernetes + timeoutSeconds: 1 +# Configure ingress if desired (exposing app beyond the boundaries of the cluster) +ingress: + enabled: true + className: "public" + annotations: + cert-manager.io/cluster-issuer: lets-encrypt + # kubernetes.io/tls-acme: "true" + hosts: + - host: api.2martens.de + paths: + - path: /wahlrecht/ + pathType: Prefix + tls: + - secretName: wahlrecht-tls + hosts: + - api.2martens.de +resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 200m + memory: 128Mi +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi + +# Configure autoscaling +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 +# Configure nodeSelector, contents will be added verbatim to key nodeSelector in deployment pod template +nodeSelector: {} +# Configure tolerations, contents will be added verbatim to key tolerations in deployment pod template +tolerations: [] +# Configure affinity, contents will be added verbatim to key affinity in deployment pod template +affinity: {} +# podSpec: will be added at the bottom of the pod template in the deployment +podSpec: {} +# containerSpec: will be added at the bottom of the container specification in the pod template +containerSpec: {} diff --git a/argocd/zookeeper/test/Chart.lock b/argocd/zookeeper/test/Chart.lock new file mode 100644 index 0000000..c04dd44 --- /dev/null +++ b/argocd/zookeeper/test/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: template + repository: https://repo.2martens.de/charts + version: 0.1.15 +digest: sha256:8bc1d4b964e7455327efb4bce13a28674488b324e69085e18850f4037b03e5c0 +generated: "2023-10-30T08:08:33.20112+01:00" diff --git a/argocd/zookeeper/test/Chart.yaml b/argocd/zookeeper/test/Chart.yaml new file mode 100644 index 0000000..a44e426 --- /dev/null +++ b/argocd/zookeeper/test/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: zookeeper +version: 0.1.0 +type: application +dependencies: + - name: template + version: 0.1.15 + repository: https://repo.2martens.de/charts diff --git a/argocd/zookeeper/test/default_values.yaml b/argocd/zookeeper/test/default_values.yaml new file mode 120000 index 0000000..e893dd5 --- /dev/null +++ b/argocd/zookeeper/test/default_values.yaml @@ -0,0 +1 @@ +../../../helm/zookeeper/values.yaml \ No newline at end of file diff --git a/argocd/zookeeper/test/overwrite_values.yaml b/argocd/zookeeper/test/overwrite_values.yaml new file mode 100644 index 0000000..eec7f10 --- /dev/null +++ b/argocd/zookeeper/test/overwrite_values.yaml @@ -0,0 +1,2 @@ +image: + tag: 7.5.1 \ No newline at end of file diff --git a/argocd/zookeeper/test/templates b/argocd/zookeeper/test/templates new file mode 120000 index 0000000..f63fac0 --- /dev/null +++ b/argocd/zookeeper/test/templates @@ -0,0 +1 @@ +../../../helm/zookeeper/templates \ No newline at end of file diff --git a/argocd/zookeeper/test/values.yaml b/argocd/zookeeper/test/values.yaml new file mode 100644 index 0000000..143a100 --- /dev/null +++ b/argocd/zookeeper/test/values.yaml @@ -0,0 +1,137 @@ +# Copy these values to your application chart completely and then modify those bits where +# the default for your application differs. The image.repository is a prime candidate for that. + +replicaCount: 1 +image: + repository: confluentinc/cp-zookeeper + pullPolicy: IfNotPresent + # Overrides the image tag whose default is latest + tag: "7.5.1" +# If image is not accessible for Kubernetes without authentication, configure required secrets here +# will be added verbatim to imagePullSecrets in deployment pod template +imagePullSecrets: [] +# Overrides the name being used in, for example, annotations +# by default it is the chart name +nameOverride: "" +# Overrides the name being used for the name of Kubernetes resources +# by default release name if it contains the chart name, otherwise releaseName-chartName +fullnameOverride: "" +serviceAccount: + # Specifies whether a service account should be created + create: 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: "" +# Configure annotations for the pod, will be added verbatim to key annotations in pod metadata +podAnnotations: {} +# Configure the security context of the application pod +podSecurityContext: {} +# fsGroup: 2000 + +# Configure security context of the application container +securityContext: {} +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 + +application: + port: 2181 + actuatorPort: 8081 + namespace: template # update to match the desired namespace + profile: prod + isSpring: false + tickTime: 2000 +# Overwrite with application specific environment variables +# Each item has key and value, where the value is parsed as a template +environment: + - name: ZOOKEEPER_CLIENT_PORT + value: "{{ .Values.application.port }}" + - name: ZOOKEEPER_TICK_TIME + value: "{{ .Values.application.tickTime }}" +enableServiceLinks: false +# Contents of this object will be added to a Kubernetes secret data section and Base64 encoded +# External secrets are not supported by this template +secrets: {} +# Configure the service +service: + type: ClusterIP + # port is targeting the containerPort http, described by application.port + port: 2181 + # actuatorPort is targeting the containerPort http-actuator, described by application.actuatorPort + # only used if application.isSpring=true + actuatorPort: 8081 +# Configure the liveness probe +# Defaults fitting for Spring Boot application that has livenessProbe enabled +livenessProbe: + enabled: false + path: /actuator/health/liveness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 120 +# Configure the readiness probe +# Defaults fitting for Spring Boot application that has readinessProbe enabled +readinessProbe: + enabled: false + path: /actuator/health/readiness + port: http-actuator + initialDelaySeconds: 30 + periodSeconds: 10 + # Allows you to specify the number of seconds the application can take to answer readinessProbe + # before failure is assumed by Kubernetes + timeoutSeconds: 1 +# Configure ingress if desired (exposing app beyond the boundaries of the cluster) +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: + - secretName: chart-example-tls + hosts: + - chart-example.local +resources: {} +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi + +# Configure autoscaling +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 +# Configure nodeSelector, contents will be added verbatim to key nodeSelector in deployment pod template +nodeSelector: {} +# Configure tolerations, contents will be added verbatim to key tolerations in deployment pod template +tolerations: [] +# Configure affinity, contents will be added verbatim to key affinity in deployment pod template +affinity: {} +# podSpec: will be added at the bottom of the pod template in the deployment +podSpec: {} +# containerSpec: will be added at the bottom of the container specification in the pod template +containerSpec: {} +argocd: + enabled: false + project: default + repoURL: https://github.com/exampleUser/exampleRepo + targetRevision: HEAD + # pathInRepo: is required if it is a git repo + pathInRepo: / + # chartName: required if repo is a Helm chart repo + chartName: "" + # targetCluster: specifies the cluster to deploy to + targetCluster: https://kubernetes.default.svc diff --git a/helm/wahlrecht/overwrite_values.yaml b/helm/wahlrecht/overwrite_values.yaml index f624a55..860a84e 100644 --- a/helm/wahlrecht/overwrite_values.yaml +++ b/helm/wahlrecht/overwrite_values.yaml @@ -55,13 +55,3 @@ environment: value: "{{ .Values.application.kafka.host }}" - name: KAFKA_PORT value: "{{ .Values.application.kafka.port }}" - -argocd: - repoURL: https://repo.2martens.de/charts/ - targetRevision: x - # pathInRepo: is required if it is a git repo - pathInRepo: "" - # chartName: required if repo is a Helm chart repo - chartName: "wahlrecht" - # targetCluster: specifies the cluster to deploy to - targetCluster: https://kubernetes.default.svc diff --git a/helm/wahlrecht/values.yaml b/helm/wahlrecht/values.yaml index 6232d7c..217a72d 100644 --- a/helm/wahlrecht/values.yaml +++ b/helm/wahlrecht/values.yaml @@ -155,14 +155,3 @@ affinity: {} podSpec: {} # containerSpec: will be added at the bottom of the container specification in the pod template containerSpec: {} -argocd: - enabled: false - project: default - repoURL: https://repo.2martens.de/charts/ - targetRevision: x - # pathInRepo: is required if it is a git repo - pathInRepo: "" - # chartName: required if repo is a Helm chart repo - chartName: "wahlrecht" - # targetCluster: specifies the cluster to deploy to - targetCluster: https://kubernetes.default.svc