Commit 9882eb08 authored by Brian Downs's avatar Brian Downs

update vendor and config map name

parent a6f64cc7
...@@ -67,6 +67,8 @@ var ( ...@@ -67,6 +67,8 @@ var (
learnerProgressKey = version.Program + "/etcd/learnerProgress" learnerProgressKey = version.Program + "/etcd/learnerProgress"
// AddressKey will contain the value of api addresses list // AddressKey will contain the value of api addresses list
AddressKey = version.Program + "/apiaddresses" AddressKey = version.Program + "/apiaddresses"
snapshotConfigMapName = version.Program + "-etcd-snapshots"
) )
type ETCD struct { type ETCD struct {
...@@ -980,7 +982,7 @@ func (e *ETCD) storeSnapshotData(ctx context.Context, snapshotFiles []snapshotFi ...@@ -980,7 +982,7 @@ func (e *ETCD) storeSnapshotData(ctx context.Context, snapshotFiles []snapshotFi
APIVersion: "v1", APIVersion: "v1",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "snapshots", Name: snapshotConfigMapName,
Namespace: metav1.NamespaceSystem, Namespace: metav1.NamespaceSystem,
}, },
Data: data, Data: data,
...@@ -994,7 +996,7 @@ func (e *ETCD) storeSnapshotData(ctx context.Context, snapshotFiles []snapshotFi ...@@ -994,7 +996,7 @@ func (e *ETCD) storeSnapshotData(ctx context.Context, snapshotFiles []snapshotFi
}, },
); err != nil && apierrors.IsAlreadyExists(err) { ); err != nil && apierrors.IsAlreadyExists(err) {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error { return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
snapshotConfigMap, err := e.cs.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(ctx, "snapshots", metav1.GetOptions{}) snapshotConfigMap, err := e.cs.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(ctx, snapshotConfigMapName, metav1.GetOptions{})
if err != nil { if err != nil {
return err return err
} }
...@@ -1026,7 +1028,7 @@ func (e *ETCD) storeSnapshotData(ctx context.Context, snapshotFiles []snapshotFi ...@@ -1026,7 +1028,7 @@ func (e *ETCD) storeSnapshotData(ctx context.Context, snapshotFiles []snapshotFi
}, },
); err != nil && apierrors.IsConflict(err) { ); err != nil && apierrors.IsConflict(err) {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error { return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
snapshotConfigMap, err := e.cs.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(ctx, "snapshots", metav1.GetOptions{}) snapshotConfigMap, err := e.cs.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(ctx, snapshotConfigMapName, metav1.GetOptions{})
if err != nil { if err != nil {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment