Skip to content

Commit 52630ac

Browse files
authored
Merge branch 'main' into encode-hash
2 parents dc970d2 + ef03ab7 commit 52630ac

File tree

64 files changed

+899
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+899
-318
lines changed

contrib/charts/dragonfly/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: v1.34.2
18+
version: v1.35.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "v1.34.2"
24+
appVersion: "v1.35.0"
2525

2626
home: https://dragonflydb.io/
2727

contrib/charts/dragonfly/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ helm upgrade --install dragonfly oci://ghcr.io/dragonflydb/dragonfly/helm/dragon
3232
|-----|------|---------|-------------|
3333
| affinity | object | `{}` | Affinity for pod assignment |
3434
| command | list | `[]` | Allow overriding the container's command |
35+
| commonLabels | object | `{}` | Common labels to add to all K8s resources |
3536
| extraArgs | list | `[]` | Extra arguments to pass to the dragonfly binary |
3637
| extraContainers | list | `[]` | Additional sidecar containers |
3738
| extraObjects | list | `[]` | extra K8s manifests to deploy |

contrib/charts/dragonfly/ci/affinity-values.golden.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.34.2"
11+
app.kubernetes.io/version: "v1.35.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.34.2"
23+
app.kubernetes.io/version: "v1.35.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.34.2"
45+
app.kubernetes.io/version: "v1.35.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -72,7 +72,7 @@ spec:
7272
serviceAccountName: test-dragonfly
7373
containers:
7474
- name: dragonfly
75-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.34.2"
75+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
7676
imagePullPolicy: IfNotPresent
7777
ports:
7878
- name: dragonfly

contrib/charts/dragonfly/ci/command_extraargs-values.golden.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.34.2"
11+
app.kubernetes.io/version: "v1.35.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.34.2"
23+
app.kubernetes.io/version: "v1.35.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.34.2"
45+
app.kubernetes.io/version: "v1.35.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -60,7 +60,7 @@ spec:
6060
serviceAccountName: test-dragonfly
6161
containers:
6262
- name: dragonfly
63-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.34.2"
63+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
6464
imagePullPolicy: IfNotPresent
6565
ports:
6666
- name: dragonfly
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
---
2+
# Source: dragonfly/templates/serviceaccount.yaml
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
name: test-dragonfly
7+
namespace: default
8+
labels:
9+
app.kubernetes.io/name: dragonfly
10+
app.kubernetes.io/instance: test
11+
app.kubernetes.io/version: "v1.35.0"
12+
app.kubernetes.io/managed-by: Helm
13+
project: cache-infrastructure
14+
team: platform
15+
---
16+
# Source: dragonfly/templates/service.yaml
17+
apiVersion: v1
18+
kind: Service
19+
metadata:
20+
name: test-dragonfly
21+
namespace: default
22+
labels:
23+
app.kubernetes.io/name: dragonfly
24+
app.kubernetes.io/instance: test
25+
app.kubernetes.io/version: "v1.35.0"
26+
app.kubernetes.io/managed-by: Helm
27+
project: cache-infrastructure
28+
team: platform
29+
spec:
30+
type: ClusterIP
31+
ports:
32+
- port: 6379
33+
targetPort: dragonfly
34+
protocol: TCP
35+
name: dragonfly
36+
selector:
37+
app.kubernetes.io/name: dragonfly
38+
app.kubernetes.io/instance: test
39+
---
40+
# Source: dragonfly/templates/deployment.yaml
41+
apiVersion: apps/v1
42+
kind: Deployment
43+
metadata:
44+
name: test-dragonfly
45+
namespace: default
46+
labels:
47+
app.kubernetes.io/name: dragonfly
48+
app.kubernetes.io/instance: test
49+
app.kubernetes.io/version: "v1.35.0"
50+
app.kubernetes.io/managed-by: Helm
51+
project: cache-infrastructure
52+
team: platform
53+
spec:
54+
replicas: 1
55+
selector:
56+
matchLabels:
57+
app.kubernetes.io/name: dragonfly
58+
app.kubernetes.io/instance: test
59+
template:
60+
metadata:
61+
annotations:
62+
labels:
63+
app.kubernetes.io/name: dragonfly
64+
app.kubernetes.io/instance: test
65+
project: cache-infrastructure
66+
team: platform
67+
spec:
68+
serviceAccountName: test-dragonfly
69+
containers:
70+
- name: dragonfly
71+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
72+
imagePullPolicy: IfNotPresent
73+
ports:
74+
- name: dragonfly
75+
containerPort: 6379
76+
protocol: TCP
77+
livenessProbe:
78+
exec:
79+
command:
80+
- /bin/sh
81+
- /usr/local/bin/healthcheck.sh
82+
failureThreshold: 3
83+
initialDelaySeconds: 10
84+
periodSeconds: 10
85+
successThreshold: 1
86+
timeoutSeconds: 5
87+
readinessProbe:
88+
exec:
89+
command:
90+
- /bin/sh
91+
- /usr/local/bin/healthcheck.sh
92+
failureThreshold: 3
93+
initialDelaySeconds: 10
94+
periodSeconds: 10
95+
successThreshold: 1
96+
timeoutSeconds: 5
97+
args:
98+
- "--alsologtostderr"
99+
resources:
100+
limits: {}
101+
requests: {}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
commonLabels:
2+
team: platform
3+
project: cache-infrastructure

contrib/charts/dragonfly/ci/extracontainer-string-values.golden.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.34.2"
11+
app.kubernetes.io/version: "v1.35.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.34.2"
23+
app.kubernetes.io/version: "v1.35.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.34.2"
45+
app.kubernetes.io/version: "v1.35.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -67,7 +67,7 @@ spec:
6767
image: busybox:latest
6868
name: sidecar-string
6969
- name: dragonfly
70-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.34.2"
70+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
7171
imagePullPolicy: IfNotPresent
7272
ports:
7373
- name: dragonfly

contrib/charts/dragonfly/ci/extracontainer-tpl-values.golden.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.34.2"
11+
app.kubernetes.io/version: "v1.35.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.34.2"
23+
app.kubernetes.io/version: "v1.35.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.34.2"
45+
app.kubernetes.io/version: "v1.35.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -64,7 +64,7 @@ spec:
6464
command: ["/bin/sh"]
6565
args: ["-c", "date; sleep 3600;"]
6666
- name: dragonfly
67-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.34.2"
67+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
6868
imagePullPolicy: IfNotPresent
6969
ports:
7070
- name: dragonfly

contrib/charts/dragonfly/ci/extraenv-and-passwordSecret-values.golden.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.34.2"
11+
app.kubernetes.io/version: "v1.35.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/extra-manifests.yaml
@@ -47,7 +47,7 @@ metadata:
4747
labels:
4848
app.kubernetes.io/name: dragonfly
4949
app.kubernetes.io/instance: test
50-
app.kubernetes.io/version: "v1.34.2"
50+
app.kubernetes.io/version: "v1.35.0"
5151
app.kubernetes.io/managed-by: Helm
5252
spec:
5353
type: ClusterIP
@@ -69,7 +69,7 @@ metadata:
6969
labels:
7070
app.kubernetes.io/name: dragonfly
7171
app.kubernetes.io/instance: test
72-
app.kubernetes.io/version: "v1.34.2"
72+
app.kubernetes.io/version: "v1.35.0"
7373
app.kubernetes.io/managed-by: Helm
7474
spec:
7575
replicas: 1
@@ -87,7 +87,7 @@ spec:
8787
serviceAccountName: test-dragonfly
8888
containers:
8989
- name: dragonfly
90-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.34.2"
90+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
9191
imagePullPolicy: IfNotPresent
9292
ports:
9393
- name: dragonfly

contrib/charts/dragonfly/ci/extraenv-values.golden.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.34.2"
11+
app.kubernetes.io/version: "v1.35.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/extra-manifests.yaml
@@ -39,7 +39,7 @@ metadata:
3939
labels:
4040
app.kubernetes.io/name: dragonfly
4141
app.kubernetes.io/instance: test
42-
app.kubernetes.io/version: "v1.34.2"
42+
app.kubernetes.io/version: "v1.35.0"
4343
app.kubernetes.io/managed-by: Helm
4444
spec:
4545
type: ClusterIP
@@ -61,7 +61,7 @@ metadata:
6161
labels:
6262
app.kubernetes.io/name: dragonfly
6363
app.kubernetes.io/instance: test
64-
app.kubernetes.io/version: "v1.34.2"
64+
app.kubernetes.io/version: "v1.35.0"
6565
app.kubernetes.io/managed-by: Helm
6666
spec:
6767
replicas: 1
@@ -79,7 +79,7 @@ spec:
7979
serviceAccountName: test-dragonfly
8080
containers:
8181
- name: dragonfly
82-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.34.2"
82+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.35.0"
8383
imagePullPolicy: IfNotPresent
8484
ports:
8585
- name: dragonfly

0 commit comments

Comments
 (0)