Skip to content

Commit ba7135a

Browse files
committed
Update to appVersion to 2.13.1
1 parent 92fb153 commit ba7135a

File tree

7 files changed

+62
-20
lines changed

7 files changed

+62
-20
lines changed

.github/workflows/lint.yml

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,43 @@ name: Lint charts
22
on: [push, pull_request]
33

44
jobs:
5-
lint:
5+
lint-test:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout
99
uses: actions/checkout@v3
10+
with:
11+
fetch-depth: 0
1012

1113
- name: Set up Helm
12-
uses: azure/setup-helm@v3
14+
uses: azure/setup-helm@v4.2.0
1315
with:
14-
version: v3.4.1
16+
version: v3.17.0
1517

16-
# Set up Python for ct lint, which needs Python for Yamale and yamllint
17-
- name: Set up Python
18-
uses: actions/setup-python@v2
18+
- uses: actions/setup-python@v5.3.0
1919
with:
20-
python-version: 3.7
20+
python-version: '3.x'
21+
check-latest: true
2122

22-
- name: Set up ct CLI
23-
uses: helm/chart-testing-action@v2.0.1
24-
with:
25-
version: v3.3.0
23+
- name: Set up chart-testing
24+
uses: helm/chart-testing-action@v2.7.0
25+
26+
- name: Run chart-testing (list-changed)
27+
id: list-changed
28+
run: |
29+
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
30+
if [[ -n "$changed" ]]; then
31+
echo "changed=true" >> "$GITHUB_OUTPUT"
32+
fi
33+
34+
- name: Run chart-testing (lint)
35+
if: steps.list-changed.outputs.changed == 'true'
36+
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
37+
38+
- name: Create kind cluster
39+
if: steps.list-changed.outputs.changed == 'true'
40+
uses: helm/kind-action@v1.12.0
2641

27-
- name: Lint chart
28-
run: ct lint --config ct.yaml
42+
- name: Run chart-testing (install)
43+
if: steps.list-changed.outputs.changed == 'true'
44+
run: ct install --target-branch ${{ github.event.repository.default_branch }}

charts/vitess-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes
44

55
type: application
66

7-
version: 0.9.1
7+
version: 0.9.2
88

9-
appVersion: "v2.13.0"
9+
appVersion: "v2.13.1"

charts/vitess-operator/templates/deployment-vitess-operator.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
{{- toYaml .securityContext | nindent 8 }}
2727
containers:
2828
- args:
29-
{{ toYaml .deployment.args | nindent 12 }}
29+
{{- toYaml .deployment.args | nindent 12 }}
3030
command:
3131
- vitess-operator
3232
env:
@@ -47,7 +47,9 @@ spec:
4747
resources:
4848
{{- toYaml .resources | nindent 12 }}
4949
priorityClassName: vitess-operator-control-plane
50-
serviceAccountName: {{ .serviceAccountName }}
50+
{{- with $ }}
51+
serviceAccountName: {{ template "vitess-operator-chart.serviceAccountName" . }}
52+
{{- end }}
5153
nodeSelector:
5254
{{- toYaml .nodeSelector | nindent 8 }}
5355
affinity:
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: scheduling.k8s.io/v1
3+
description: The vitess-operator control plane.
4+
globalDefault: false
5+
kind: PriorityClass
6+
metadata:
7+
name: vitess-operator-control-plane
8+
value: 5000
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: scheduling.k8s.io/v1
3+
description: Vitess components (vttablet, vtgate, vtctld, etcd)
4+
globalDefault: false
5+
kind: PriorityClass
6+
metadata:
7+
name: vitess
8+
value: 1000

charts/vitess-operator/templates/role-vitess-operator.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,14 @@ rules:
6969
- vitessbackupstorages
7070
- vitessbackupstorages/status
7171
- vitessbackupstorages/finalizers
72+
- vitessbackupschedules
73+
- vitessbackupschedules/status
74+
- vitessbackupschedules/finalizers
7275
verbs:
7376
- '*'
77+
- apiGroups:
78+
- batch
79+
resources:
80+
- jobs
81+
verbs:
82+
- '*'

charts/vitess-operator/values.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ serviceAccount:
3030
podAnnotations: {}
3131

3232
podSecurityContext: {}
33-
# fsGroup: 2000
3433

3534
securityContext: {}
3635
# capabilities:
@@ -76,8 +75,8 @@ priorityClass:
7675
deployment:
7776
# -- Arguments to vitess-operator
7877
args:
79-
- --logtostderr
80-
- -v=4
78+
- --logtostderr
79+
- -v=4
8180
# -- Environment variables to pass to vitess-operator
8281
# Particularly noteworthy is WATCH_NAMESPACE to determine which
8382
# namespaces to watch for CRDS. The default is the namespace wherein

0 commit comments

Comments
 (0)