diff --git a/CHANGELOG.md b/CHANGELOG.md index 3224f1fb..d790c2f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Disabled etcd v2 backup for Azure and AWS. + ## [2.2.1] - 2021-04-06 - Bump up dependencies: diff --git a/helm/etcd-backup-operator/ci/default-values.yaml b/helm/etcd-backup-operator/ci/default-values.yaml index 1bc2c3ee..8bd90a14 100644 --- a/helm/etcd-backup-operator/ci/default-values.yaml +++ b/helm/etcd-backup-operator/ci/default-values.yaml @@ -5,6 +5,8 @@ Installation: EtcdBackup: EtcdDataDir: "" TestingEnvironment: "" + Provider: + Kind: AWS Secret: EtcdBackup: AWSAccessKey: "" diff --git a/helm/etcd-backup-operator/templates/configmap.yaml b/helm/etcd-backup-operator/templates/configmap.yaml index 0d4babca..99aecba4 100644 --- a/helm/etcd-backup-operator/templates/configmap.yaml +++ b/helm/etcd-backup-operator/templates/configmap.yaml @@ -25,7 +25,7 @@ data: bucket: "{{ .Values.Installation.V1.Infra.EtcdBackup.S3Bucket }}" region: "{{ .Values.Installation.V1.Infra.EtcdBackup.S3Region }}" etcdv2: - datadir: /var/lib/etcd + datadir: "{{ if eq .Values.Installation.V1.Provider.Kind "kvm" }}/var/lib/etcd{{ end }}" etcdv3: cacert: "/certs/{{ .Values.Installation.V1.Infra.EtcdBackup.ClientCaCertFileName }}" cert: "/certs/{{ .Values.Installation.V1.Infra.EtcdBackup.ClientCertFileName }}"