diff --git a/all-dev-apps.yaml b/all-dev-apps.yaml index a515b16..7337100 100644 --- a/all-dev-apps.yaml +++ b/all-dev-apps.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: comissions-dev + name: all-dev-apps namespace: argocd spec: destination: diff --git a/charts/core-api/Chart.yaml b/charts/core-api/Chart.yaml index 350043d..27bfaf0 100644 --- a/charts/core-api/Chart.yaml +++ b/charts/core-api/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: core-api +name: search description: A Helm chart for Kubernetes # A chart can be either an 'application' or a 'library' chart. diff --git a/charts/core-api/templates/deployment.yaml b/charts/core-api/templates/deployment.yaml index 2b0094a..1931455 100644 --- a/charts/core-api/templates/deployment.yaml +++ b/charts/core-api/templates/deployment.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "core-api.fullname" . }} + name: {{ include "search.fullname" . }} labels: - {{- include "core-api.labels" . | nindent 4 }} + {{- include "search.labels" . | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "core-api.selectorLabels" . | nindent 6 }} + {{- include "search.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} @@ -18,13 +18,13 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "core-api.selectorLabels" . | nindent 8 }} + {{- include "search.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "core-api.serviceAccountName" . }} + serviceAccountName: {{ include "search.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: diff --git a/charts/core-api/templates/hpa.yaml b/charts/core-api/templates/hpa.yaml index 9632f07..1bc6d10 100644 --- a/charts/core-api/templates/hpa.yaml +++ b/charts/core-api/templates/hpa.yaml @@ -2,14 +2,14 @@ apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: - name: {{ include "core-api.fullname" . }} + name: {{ include "search.fullname" . }} labels: - {{- include "core-api.labels" . | nindent 4 }} + {{- include "search.labels" . | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "core-api.fullname" . }} + name: {{ include "search.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/charts/core-api/templates/ingress.yaml b/charts/core-api/templates/ingress.yaml index fa4e0d3..5068067 100644 --- a/charts/core-api/templates/ingress.yaml +++ b/charts/core-api/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "core-api.fullname" . -}} +{{- $fullName := include "search.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") }} @@ -17,7 +17,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "core-api.labels" . | nindent 4 }} + {{- include "search.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/core-api/templates/service.yaml b/charts/core-api/templates/service.yaml index 4d77764..0cfdfcc 100644 --- a/charts/core-api/templates/service.yaml +++ b/charts/core-api/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "core-api.fullname" . }} + name: {{ include "search.fullname" . }} labels: - {{- include "core-api.labels" . | nindent 4 }} + {{- include "search.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "core-api.selectorLabels" . | nindent 4 }} \ No newline at end of file + {{- include "search.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/charts/core-api/templates/serviceaccount.yaml b/charts/core-api/templates/serviceaccount.yaml index 777195b..707c45d 100644 --- a/charts/core-api/templates/serviceaccount.yaml +++ b/charts/core-api/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "core-api.serviceAccountName" . }} + name: {{ include "search.serviceAccountName" . }} labels: - {{- include "core-api.labels" . | nindent 4 }} + {{- include "search.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/dev/core-api.yaml b/dev/core-api.yaml index 644abf6..0ccd81e 100644 --- a/dev/core-api.yaml +++ b/dev/core-api.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: core-api + name: search namespace: argocd spec: goTemplate: true @@ -14,7 +14,7 @@ spec: - path: "dev/.config/*.json" template: metadata: - name: "core-api-{{.deployment.cluster.namespace}}" + name: "search-{{.deployment.cluster.namespace}}" spec: project: "{{.deployment.argocd.project}}" source: