Skip to content
This repository was archived by the owner on Mar 28, 2020. It is now read-only.

Commit 6d486b1

Browse files
authored
api/EtcdCluster: removed deprecated BaseImage field (#1823)
1 parent db286e1 commit 6d486b1

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ Please follow the latest backup/restore CR definition for future backup and rest
2525
- Default base image is changed to `gcr.io/etcd-development/etcd`, default etcd version is `3.2.13`.
2626

2727
### Removed
28+
2829
- EtcdBackup: BackupSpec removed ClusterName field in favor of etcd endpoints.
30+
- EtcdCluster: ClusterSpec removed deprecated BaseImage field.
2931

3032
### Fixed
3133

pkg/apis/etcd/v1beta2/cluster.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ type ClusterSpec struct {
7878
//
7979
// By default, it is `quay.io/coreos/etcd`.
8080
Repository string `json:"repository,omitempty"`
81-
// **DEPRECATED**. Use Repository instead.
82-
// TODO: remove this field in v0.7.2 .
83-
BaseImage string `json:"baseImage,omitempty"`
8481

8582
// Version is the expected version of the etcd cluster.
8683
// The etcd-operator will eventually make the etcd cluster version
@@ -165,11 +162,7 @@ func (c *ClusterSpec) Validate() error {
165162
func (e *EtcdCluster) SetDefaults() {
166163
c := &e.Spec
167164
if len(c.Repository) == 0 {
168-
if len(c.BaseImage) != 0 {
169-
c.Repository = c.BaseImage
170-
} else {
171-
c.Repository = defaultRepository
172-
}
165+
c.Repository = defaultRepository
173166
}
174167

175168
if len(c.Version) == 0 {

0 commit comments

Comments
 (0)