Skip to content

Commit

Permalink
chore: Align main values file (#50)
Browse files Browse the repository at this point in the history
Change-Id: I611b3b06f16b9e2a399af458025c904a5671848e
  • Loading branch information
MykolaMarusenko committed Feb 29, 2024
1 parent aab4312 commit 2ff1437
Show file tree
Hide file tree
Showing 34 changed files with 48 additions and 32 deletions.
3 changes: 3 additions & 0 deletions chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ EDP Cluster Addons that extend the Kubernetes Cluster Functionality
| defectdojo.createNamespace | bool | `false` | whether to create the namespace or not |
| dependency-track.createNamespace | bool | `false` | |
| dependency-track.enable | bool | `false` | |
| destinationServer | string | `"in-cluster"` | |
| edp.createNamespace | bool | `false` | |
| edp.enable | bool | `false` | |
| extensions-oidc.createNamespace | bool | `false` | |
Expand Down Expand Up @@ -70,13 +71,15 @@ EDP Cluster Addons that extend the Kubernetes Cluster Functionality
| prometheus-operator.enable | bool | `false` | |
| redis-operator.createNamespace | bool | `false` | |
| redis-operator.enable | bool | `false` | |
| repoUrl | string | `"ssh://ci@git.example.com:22/cluster-add-ons"` | |
| report-portal.createNamespace | bool | `false` | |
| report-portal.enable | bool | `false` | |
| sonar-operator.createNamespace | bool | `false` | |
| sonar-operator.enable | bool | `false` | |
| sonar.createNamespace | bool | `false` | |
| sonar.enable | bool | `false` | |
| storage-class.enable | bool | `false` | |
| targetRevision | string | `"main"` | |
| tekton-cache.createNamespace | bool | `false` | |
| tekton-cache.enable | bool | `false` | |
| tekton.createNamespace | bool | `false` | |
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/argo-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
argo-cd:
{{- toYaml (index .Values "argo-cd") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: edp
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/aws-efs-csi-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
aws-efs-csi-driver:
{{- toYaml (index .Values "aws-efs-csi-driver") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: kube-system
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/capsule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
capsule:
{{- toYaml .Values.capsule | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: capsule-system
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/cert-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
cert-manager:
{{- toYaml (index .Values "cert-manager") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: cert-manager
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/defectdojo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
defectdojo:
{{- toYaml .Values.defectdojo | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: defectdojo
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/dependency-track.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
dependency-track:
{{- toYaml (index .Values "dependency-track") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: dependency-track
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/edp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
edp-install:
{{- toYaml .Values.edp | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: edp
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/extensions-oidc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
extensionsOIDC:
{{- toYaml (index .Values "extensions-oidc") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: security
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/external-secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
external-secrets:
{{- toYaml (index .Values "external-secrets") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: external-secrets
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/fluent-bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
fluent-bit:
{{- toYaml (index .Values "fluent-bit") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: logging
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/harbor-ha-okd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
harbor:
{{- toYaml (index .Values "harbor-ha-okd") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: harbor
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/harbor-ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
harbor:
{{- toYaml (index .Values "harbor-ha") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: harbor
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/harbor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
harbor:
{{- toYaml .Values.harbor | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: harbor
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/ingress-nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
ingress-nginx:
{{- toYaml (index .Values "ingress-nginx") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: ingress-nginx
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/jaeger-opertor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
jaeger-operator:
{{- toYaml (index .Values "jaeger-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: jaeger-operator
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/keycloak-postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
postgresql:
{{- toYaml (index .Values "keycloak-postgresql") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: security
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/keycloak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
keycloakx:
{{- toYaml .Values.keycloak | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: security
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/minio-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
minio-operator:
{{- toYaml (index .Values "minio-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: minio-operator
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/nexus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
nexus-repository-manager:
{{- toYaml .Values.sonarqube | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: nexus
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
opensearch:
{{- toYaml .Values.opensearch | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: logging
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/opentelemetry-opertor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
opentelemetry-operator:
{{- toYaml (index .Values "opentelemetry-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: opentelemetry-operator
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/postgres-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
postgres-operator:
{{- toYaml (index .Values "postgres-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: postgres-operator
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/prometheus-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
kube-prometheus-stack:
{{- toYaml (index .Values "prometheus-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: monitoring
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/redis-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
redis-operator:
{{- toYaml (index .Values "redis-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: redis-operator
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/report-portal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
report-portal:
{{- toYaml (index .Values "report-portal") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: report-portal
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/sonar-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
sonar-operator:
{{- toYaml (index .Values "sonar-operator") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: sonar
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
sonarqube:
{{- toYaml .Values.sonar | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: sonar
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/storage-class.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
syncPolicy:
automated:
prune: true
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/tekton.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
path: add-ons/tekton
targetRevision: {{ .Values.targetRevision }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: tekton-pipelines
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/vault-kms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
vault:
{{- toYaml (index .Values "vault-kms") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: vault
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/vault-okd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
vault:
{{- toYaml (index .Values "vault-okd") | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: vault
syncPolicy:
automated:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/vault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
vault:
{{- toYaml .Values.vault | nindent 10 }}
destination:
server: {{ .Values.destinationServer | default "https://kubernetes.default.svc" }}
name: {{ .Values.destinationServer | default "in-cluster" }}
namespace: vault
syncPolicy:
automated:
Expand Down
13 changes: 13 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# Specifies the destination server where the code will be deployed.
# In this case, "in-cluster" indicates that the deployment will happen within the Kubernetes cluster itself.
destinationServer: "in-cluster"

# Specifies the URL of the Git repository from which the code will be pulled for deployment.
# It is provided in the SSH format, indicating the username (`ci`), hostname (`git.example.com`),
# and port (`22`) of the Git server, along with the repository path (`cluster-add-ons`).
repoUrl: "ssh://ci@git.example.com:22/cluster-add-ons"

# Specifies the target revision or branch of the Git repository that will be deployed.
# In this case, "main" indicates that the main branch of the repository will be used for deployment.
targetRevision: "main"

# keep sorted order
# -- ArgoCD Deployment
argo-cd:
Expand Down

0 comments on commit 2ff1437

Please sign in to comment.