Skip to content

Commit 6b854fd

Browse files
committed
Fix skaffold and chart.
1 parent 5a191cf commit 6b854fd

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

hack/charts/mysql-operator/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
args:
2727
- --orchestrator-uri=http://{{ template "mysql-operator.orchestrator.fullname" . }}.{{ .Release.Namespace }}/api
2828
- --orchestrator-secret={{ template "mysql-operator.orchestrator.fullname" . }}
29-
{{- if .Values.helperImage -}}
29+
{{- if .Values.helperImage }}
3030
- --helper-image={{ .Values.helperImage }}
3131
{{- end -}}
3232
{{- range $arg := .Values.extraArgs }}

hack/charts/mysql-operator/values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ installCRDs: true
2828

2929
orchestrator:
3030
orchestratorConf:
31-
RaftAdvertise: "{{ .Env.HOSTNAME }}.mysql-operator-orchestrator-headless"
32-
3331
# the operator is handling the registries, do not auto discover
3432
DiscoverByShowSlaveHosts: false
3533
# forget missing instances automatically
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
orchestrator:
2+
antiAffinity: soft
3+
replicas: 1

skaffold.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ kind: Config
33
build:
44
tagPolicy: sha256
55
artifacts:
6-
- imageName: mysql-helper
6+
- imageName: quay.io/presslabs/mysql-helper
77
workspace: hack/docker/mysql-helper
8-
- imageName: mysql-operator
8+
- imageName: quay.io/presslabs/mysql-operator
99
workspace: hack/docker/mysql-operator
1010
local:
1111
skipPush: true
1212
deploy:
1313
helm:
1414
releases:
1515
- name: test
16-
chartPath: hack/charts/controller
16+
chartPath: hack/charts/mysql-operator
17+
valuesFilePath: hack/e2e-tests/mysql-operator-values.yaml
1718
values:
18-
image: mysql-operator
19-
conf.helper-image: mysql-helper
19+
image: quay.io/presslabs/mysql-operator
20+
helperImage: quay.io/presslabs/mysql-helper

0 commit comments

Comments
 (0)