-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: Renku search helm charts (#3481) * feat: add Solr to the subcharts. * feat: add message queue Redis to data-services (#3508) * chore: add gateway config for search endpoint * chore: add redis values for users sync svc * chore: add redis access to user sync job
- Loading branch information
1 parent
c1f078c
commit 85c8202
Showing
15 changed files
with
416 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| {{/* vim: set filetype=mustache: */}} | ||
| {{/* | ||
| Expand the name of the chart. | ||
| */}} | ||
| {{- define "renku.search.searchApi.name" -}} | ||
| {{- "search-api" -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "renku.search.searchProvision.name" -}} | ||
| {{- "search-provision" -}} | ||
| {{- 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 "renku.search.searchApi.fullname" -}} | ||
| {{- if .Values.fullnameOverride -}} | ||
| {{- printf "%s-search-api" .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} | ||
| {{- else -}} | ||
| {{- printf "%s-search-api" .Release.Name | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "renku.search.searchProvision.fullname" -}} | ||
| {{- if .Values.fullnameOverride -}} | ||
| {{- printf "%s-search-provision" .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} | ||
| {{- else -}} | ||
| {{- printf "%s-search-provision" .Release.Name | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
| {{- end -}} |
80 changes: 80 additions & 0 deletions
80
helm-chart/renku/templates/search/search-api-deployment.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ template "renku.search.searchApi.fullname" . }} | ||
| labels: | ||
| app: {{ template "renku.search.searchApi.name" . }} | ||
| chart: {{ template "renku.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| spec: | ||
| replicas: {{ .Values.search.searchApi.replicas }} | ||
| strategy: | ||
| type: Recreate | ||
| selector: | ||
| matchLabels: | ||
| app: {{ template "renku.search.searchApi.name" . }} | ||
| release: {{ .Release.Name }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: {{ template "renku.search.searchApi.name" . }} | ||
| release: {{ .Release.Name }} | ||
| spec: | ||
| securityContext: | ||
| {{- toYaml .Values.podSecurityContext | nindent 8 }} | ||
| automountServiceAccountToken: {{ .Values.global.debug }} | ||
| containers: | ||
| - name: search-api | ||
| image: "{{ .Values.search.searchApi.image.repository }}:{{ .Values.search.searchApi.image.tag }}" | ||
| imagePullPolicy: {{ .Values.search.searchApi.image.pullPolicy }} | ||
| securityContext: | ||
| {{- toYaml .Values.securityContext | nindent 12 }} | ||
| env: | ||
| - name: RS_SOLR_URL | ||
| value: "http://{{ template "solr.fullname" . }}:{{ .Values.global.solr.port }}/solr" | ||
| - name: RS_SOLR_CORE | ||
| value: {{ first .Values.solr.coreNames }} | ||
| - name: RS_SOLR_USER | ||
| value: {{ default "admin" .Values.solr.auth.adminUsername | quote }} | ||
| - name: RS_SOLR_PASS | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: {{ template "solr.fullname" . }} | ||
| key: solr-password | ||
| - name: RS_SOLR_DEFAULT_COMMIT_WITHIN | ||
| value: "500ms" | ||
| - name: RS_SOLR_LOG_MESSAGE_BODIES | ||
| value: "false" | ||
| - name: JAVA_OPTS | ||
| value: "-Xmx{{ .Values.search.searchApi.jvmXmx }} -XX:+UseZGC -XX:+ZGenerational" | ||
| ports: | ||
| - name: http-search-api | ||
| containerPort: 8080 | ||
| protocol: TCP | ||
| livenessProbe: | ||
| httpGet: | ||
| path: /ping | ||
| port: http-search-api | ||
| readinessProbe: | ||
| httpGet: | ||
| path: /ping | ||
| port: http-search-api | ||
| resources: | ||
| {{- toYaml .Values.search.searchApi.resources | nindent 12 }} | ||
| volumeMounts: | ||
| {{- include "certificates.volumeMounts.javaCertsGeneral" . | nindent 12 }} | ||
| volumes: | ||
| {{- include "certificates.volumes" . | nindent 8 }} | ||
| {{- with .Values.nodeSelector }} | ||
| nodeSelector: | ||
| {{ toYaml . | indent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.affinity }} | ||
| affinity: | ||
| {{ toYaml . | indent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.tolerations }} | ||
| tolerations: | ||
| {{ toYaml . | indent 8 }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ template "renku.search.searchApi.fullname" . }} | ||
| labels: | ||
| app: {{ template "renku.search.searchApi.name" . }} | ||
| chart: {{ template "renku.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| annotations: | ||
| prometheus.io/scrape: 'true' | ||
| prometheus.io/path: '/metrics' | ||
| prometheus.io/port: '8080' | ||
| spec: | ||
| type: {{ .Values.search.searchApi.service.type }} | ||
| ports: | ||
| - port: {{ .Values.search.searchApi.service.port }} | ||
| targetPort: http-search-api | ||
| protocol: TCP | ||
| name: http | ||
| selector: | ||
| app: {{ template "renku.search.searchApi.name" . }} | ||
| release: {{ .Release.Name }} |
93 changes: 93 additions & 0 deletions
93
helm-chart/renku/templates/search/search-provision-deployment.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ template "renku.search.searchProvision.fullname" . }} | ||
| labels: | ||
| app: {{ template "renku.search.searchProvision.name" . }} | ||
| chart: {{ template "renku.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| spec: | ||
| replicas: {{ .Values.search.searchProvision.replicas }} | ||
| strategy: | ||
| type: Recreate | ||
| selector: | ||
| matchLabels: | ||
| app: {{ template "renku.search.searchProvision.name" . }} | ||
| release: {{ .Release.Name }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: {{ template "renku.search.searchProvision.name" . }} | ||
| release: {{ .Release.Name }} | ||
| # The label below enables to connect to redis | ||
| {{ .Values.global.redis.clientLabel | toYaml | nindent 8 }} | ||
| spec: | ||
| securityContext: | ||
| {{- toYaml .Values.podSecurityContext | nindent 8 }} | ||
| automountServiceAccountToken: {{ .Values.global.debug }} | ||
| containers: | ||
| - name: search-provision | ||
| image: "{{ .Values.search.searchProvision.image.repository }}:{{ .Values.search.searchProvision.image.tag }}" | ||
| imagePullPolicy: {{ .Values.search.searchProvision.image.pullPolicy }} | ||
| securityContext: | ||
| {{- toYaml .Values.securityContext | nindent 12 }} | ||
| env: | ||
| - name: RS_REDIS_HOST | ||
| value: {{ .Values.global.redis.host | quote }} | ||
| - name: RS_REDIS_PORT | ||
| value: {{ .Values.global.redis.port | quote }} | ||
| - name: RS_REDIS_SENTINEL | ||
| value: {{ .Values.global.redis.sentinel.enabled | quote }} | ||
| - name: RS_REDIS_DB | ||
| value: {{ .Values.global.redis.dbIndex.events | quote }} | ||
| - name: RS_REDIS_PASSWORD | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: {{ .Values.global.redis.existingSecret }} | ||
| key: {{ .Values.global.redis.existingSecretPasswordKey }} | ||
| - name: RS_REDIS_MASTER_SET | ||
| value: {{ .Values.global.redis.sentinel.masterSet | quote }} | ||
| {{- range $k, $v := .Values.global.events.streams }} | ||
| - name: RS_REDIS_QUEUE_{{ $k }} | ||
| value: {{ $v }} | ||
| {{- end }} | ||
| - name: RS_SOLR_URL | ||
| value: "http://{{ template "solr.fullname" . }}:{{ .Values.global.solr.port }}/solr" | ||
| - name: RS_SOLR_CORE | ||
| value: {{ first .Values.solr.coreNames }} | ||
| - name: RS_SOLR_USER | ||
| value: {{ default "admin" .Values.solr.auth.adminUsername | quote }} | ||
| - name: RS_SOLR_PASS | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: {{ template "solr.fullname" . }} | ||
| key: solr-password | ||
| - name: RS_SOLR_DEFAULT_COMMIT_WITHIN | ||
| value: "500ms" | ||
| - name: RS_SOLR_LOG_MESSAGE_BODIES | ||
| value: "false" | ||
| - name: JAVA_OPTS | ||
| value: "-Xmx{{ .Values.search.searchProvision.jvmXmx }} -XX:+UseZGC -XX:+ZGenerational" | ||
| ports: | ||
| - name: http-searchprov | ||
| containerPort: 8081 | ||
| protocol: TCP | ||
| resources: | ||
| {{- toYaml .Values.search.searchProvision.resources | nindent 12 }} | ||
| volumeMounts: | ||
| {{- include "certificates.volumeMounts.javaCertsGeneral" . | nindent 12 }} | ||
| volumes: | ||
| {{- include "certificates.volumes" . | nindent 8 }} | ||
| {{- with .Values.nodeSelector }} | ||
| nodeSelector: | ||
| {{ toYaml . | indent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.affinity }} | ||
| affinity: | ||
| {{ toYaml . | indent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.tolerations }} | ||
| tolerations: | ||
| {{ toYaml . | indent 8 }} | ||
| {{- end }} |
Oops, something went wrong.