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.

Sign up for GitHub

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

Jump to bottom

Bump etcdbrctl to v0.25.1 #824

Merged
merged 3 commits into from
Nov 7, 2023
Merged

Bump etcdbrctl to v0.25.1 #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f27b672
Bump etcdbrctl to v0.25.1
jknipper Sep 11, 2023
8206975
From 1.23 onwards
jknipper Oct 26, 2023
c4e07b4
Update images
jknipper Oct 26, 2023
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
28 changes: 14 additions & 14 deletions charts/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,10 +1298,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.17.0
Expand Down Expand Up @@ -1704,10 +1704,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.19.1
Expand Down Expand Up @@ -2534,10 +2534,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.19.1
Expand Down Expand Up @@ -3115,10 +3115,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.19.1
Expand Down Expand Up @@ -3198,10 +3198,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.19.1
Expand Down Expand Up @@ -3698,10 +3698,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.19.1
Expand Down Expand Up @@ -3864,10 +3864,10 @@ imagesForVersion:
tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81
etcd:
repository: keppel.global.cloud.sap/ccloud/etcd
tag: v3.4.13-bootstrap-3
tag: v3.4.13-bootstrap-13
etcdBackup:
repository: keppel.global.cloud.sap/ccloud/etcdbrctl
tag: v0.15.4
tag: v0.25.1
flannel:
repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel
tag: v0.19.1
Expand Down
54 changes: 53 additions & 1 deletion charts/kube-master/charts/etcd/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ data:
--listen-client-urls=http://0.0.0.0:2379 \
--listen-metrics-urls=http://0.0.0.0:8081
{{- end }}
{{- if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}
etcd.conf.yaml: |-
name: kubernikus
initial-cluster: default=http://127.0.0.1:2380
{{- end }}
---
{{- if .Capabilities.APIVersions.Has "apps/v1" }}
apiVersion: "apps/v1"
Expand Down Expand Up @@ -101,6 +106,27 @@ spec:
configMap:
name: {{ include "fullname" . }}
defaultMode: 0700
{{- if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}
- name: etcd-config-file
configMap:
name: {{ include "fullname" . }}
defaultMode: 0644
items:
- key: etcd.conf.yaml
path: etcd.conf.yaml
{{- if eq .Values.backup.storageProvider "S3" }}
- name: credentials-aws
secret:
secretName: {{ include "fullname" . }}-aws
items:
- key: access-key-id
path: accessKeyID
- key: region
path: region
- key: secret-access-key
path: secretAccessKey
{{- end }}
{{- end }}
{{- if .Values.secure.enabled }}
- name: certs-etcd
secret:
Expand Down Expand Up @@ -186,7 +212,7 @@ spec:
{{- if .Values.backup.enabled }}
- name: backup
command:
- etcdbrctl
- {{ if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}/{{ end }}etcdbrctl
- server
- --schedule={{ .Values.backup.schedule }}
{{- if .Values.backup.maxBackups }}
Expand All @@ -211,6 +237,10 @@ spec:
- --insecure-transport=true
{{- end }}
image: "{{ include "etcdBackup.image" . }}"
{{- if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}
securityContext:
runAsUser: 0
{{- end }}
ports:
- containerPort: 8080
# the name is important here, so that we get metrics
Expand All @@ -223,6 +253,10 @@ spec:
secretKeyRef:
name: {{ include "fullname" . }}-aws
key: bucket-name
{{- if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}
- name: AWS_APPLICATION_CREDENTIALS
value: /etc/aws/credentials
{{- else }}
- name: AWS_REGION
valueFrom:
secretKeyRef:
Expand All @@ -238,6 +272,7 @@ spec:
secretKeyRef:
name: {{ include "fullname" . }}-aws
key: access-key-id
{{- end }}
{{- else if eq .Values.backup.storageProvider "Swift" }}
- name: STORAGE_CONTAINER
value: {{ .Values.storageContainer }}
Expand All @@ -263,6 +298,14 @@ spec:
secretKeyRef:
name: {{ include "fullname" . }}
key: openstack-project-id
{{- end }}
{{- if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: POD_NAMESPACE
value: {{ include "fullname" . }}
{{- end }}
volumeMounts:
- mountPath: /var/lib/etcd
Expand All @@ -271,6 +314,15 @@ spec:
- mountPath: /etc/kubernetes/certs
name: certs-backup
readOnly: true
{{- end }}
{{- if (semverCompare ">= 1.23-0" .Values.version.kubernetes) }}
- name: etcd-config-file
mountPath: /var/etcd/config
{{- if eq .Values.backup.storageProvider "S3" }}
- name: credentials-aws
mountPath: "/etc/aws/credentials"
readOnly: true
{{- end }}
{{- end }}
resources:
{{ toYaml .Values.backup.resources | indent 12 }}
Expand Down