Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: optimize serviceVersion and images #844

Merged
merged 3 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions addons/elasticsearch/templates/componentdefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ items:
spec:
provider: &provider kubeblocks
description: &description Elasticsearch is a distributed, RESTful search engine optimized for speed and relevance on production-scale workloads.
serviceVersion: 8.8.2
serviceKind: &serviceKind elasticsearch
updateStrategy: &updateStrategy Parallel
exporter: &exporter
Expand Down Expand Up @@ -80,7 +79,6 @@ items:
value: http
- name: NSS_SDB_USE_CACHE
value: "no"
image: {{ include "elasticsearch-8.8.2.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- sh
Expand Down Expand Up @@ -159,7 +157,6 @@ items:
- mountPath: /tmp/plugins
name: plugins
- name: exporter
image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.exporter.repository }}:{{ .Values.image.exporter.tag | default "latest" }}
command:
- /bin/elasticsearch_exporter
- "--es.uri=http://localhost:9200"
Expand Down Expand Up @@ -213,7 +210,6 @@ items:
value: http
- name: NSS_SDB_USE_CACHE
value: "no"
image: {{ include "elasticsearch-8.8.2.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
name: elastic-internal-init-filesystem
securityContext:
Expand Down Expand Up @@ -273,7 +269,6 @@ items:
value: http
- name: NSS_SDB_USE_CACHE
value: "no"
image: {{ include "elasticsearch-8.8.2.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
name: elastic-internal-suspend
securityContext:
Expand Down Expand Up @@ -305,7 +300,6 @@ items:
- mountPath: /usr/share/elasticsearch/plugins
name: elastic-internal-elasticsearch-plugins-local
- name: prepare-plugins
image: {{ include "elasticsearch-8.8.2.image" . }}
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down Expand Up @@ -348,7 +342,6 @@ items:
spec:
provider: *provider
description: *description
serviceVersion: 7.10.1
serviceKind: *serviceKind
updateStrategy: *updateStrategy
exporter: *exporter
Expand All @@ -371,7 +364,6 @@ items:
spec:
provider: *provider
description: *description
serviceVersion: 7.7.1
serviceKind: *serviceKind
updateStrategy: *updateStrategy
exporter: *exporter
Expand Down
3 changes: 0 additions & 3 deletions addons/qdrant/templates/componentdefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ spec:
provider: kubeblocks
description: High-performance, massive-scale Vector Database for the next generation of AI.
serviceKind: qdrant
serviceVersion: 1.10.0
updateStrategy: BestEffortParallel
services:
- name: qdrant
Expand Down Expand Up @@ -60,7 +59,6 @@ spec:
- |
cp /bin/jq /qdrant/tools/jq
cp /bin/curl /qdrant/tools/curl
image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag | default "latest" }}
imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
Expand All @@ -69,7 +67,6 @@ spec:
name: tools
containers:
- name: qdrant
image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:v1.8.4
imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
securityContext:
runAsUser: 0
Expand Down
6 changes: 2 additions & 4 deletions addons/starrocks-ce/templates/componentdefinition-be.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ metadata:
{{- include "starrocks.labels" . | nindent 4 }}
spec:
provider: kubeblocks
description: A StarRocks BE v{{.Chart.AppVersion}} component definition for Kubernetes
description: A StarRocks BE component definition for Kubernetes
serviceKind: starrocks-be
serviceVersion: {{.Chart.AppVersion}}
updateStrategy: BestEffortParallel
services:
- name: be
Expand Down Expand Up @@ -49,7 +48,6 @@ spec:
runtime:
containers:
- name: be
image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.be.repository }}:{{ default .Values.image.be.tag }}
imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }}
command:
- bash
Expand All @@ -60,7 +58,7 @@ spec:
- name: HOST_TYPE
value: FQDN
- name: TZ
value: Asia/Shanghai
value: {{ .Values.timezone }}
- name: POD_NAME
valueFrom:
fieldRef:
Expand Down
16 changes: 2 additions & 14 deletions addons/starrocks-ce/templates/componentdefinition-fe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ metadata:
{{ include "starrocks.labels" . | nindent 4 }}
spec:
provider: kubeblocks
description: A StarRocks FE v{{ .Chart.AppVersion }} component definition for Kubernetes
description: A StarRocks FE component definition for Kubernetes
# The FE can only perform leader election when the majority of members are active.
updateStrategy: Parallel
serviceKind: starrocks-fe
serviceVersion: {{.Chart.AppVersion}}
services:
- name: fe
serviceName: fe
Expand Down Expand Up @@ -42,16 +41,6 @@ spec:
numDigits: 5
numSymbols: 0
letterCase: MixedCases
lifecycleActions:
accountProvision:
customHandler:
image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.fe.repository }}:{{ default .Values.image.fe.tag }}
exec:
command:
- /bin/bash
- -c
- |
mysql -P{{ .Values.fe.queryPort }} -h127.0.0.1 -u${STARROCKS_USER} -e "SET PASSWORD = PASSWORD('${STARROCKS_PASSWORD}')"
configs:
- name: fe-cm
templateRef: {{ include "starrocks.name" . }}-fe-cm
Expand Down Expand Up @@ -88,7 +77,6 @@ spec:
runtime:
containers:
- name: fe
image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.fe.repository }}:{{ default .Values.image.fe.tag }}
imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }}
command:
- bash
Expand All @@ -112,7 +100,7 @@ spec:
- name: HOST_TYPE
value: FQDN
- name: TZ
value: Asia/Shanghai
value: {{ .Values.timezone }}
- name: POD_NAME
valueFrom:
fieldRef:
Expand Down
5 changes: 0 additions & 5 deletions addons/starrocks-ce/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,8 @@ image:
pullPolicy: IfNotPresent
fe:
repository: starrocks/fe-ubuntu
tag: 3.3.0
be:
repository: starrocks/be-ubuntu
tag: 3.3.0
cn:
repository: starrocks/cn-ubuntu
tag: 3.3.0

fe:
config: |
Expand Down
Loading