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

[WIP] Revert PR #17160 #17224

Closed
wants to merge 2 commits into from
Closed

[WIP] Revert PR #17160 #17224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a2c703
Revert "hack/update-expected.sh"
hakuna-matatah Jan 20, 2025
d4217e7
Revert "Update etcd to v3.5.17"
hakuna-matatah Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion pkg/model/components/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct {
var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}

const (
DefaultEtcd3Version_1_22 = "3.5.17"
DefaultEtcd3Version_1_22 = "3.5.13"
)

// BuildOptions is responsible for filling in the defaults for the etcd cluster model
Expand Down
17 changes: 8 additions & 9 deletions pkg/model/components/etcdmanager/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,14 @@ type etcdVersion struct {
var etcdSupportedImages = []etcdVersion{
{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
{Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"},
{Version: "3.5.0", SymlinkToVersion: "3.5.17"},
{Version: "3.5.1", SymlinkToVersion: "3.5.17"},
{Version: "3.5.3", SymlinkToVersion: "3.5.17"},
{Version: "3.5.4", SymlinkToVersion: "3.5.17"},
{Version: "3.5.6", SymlinkToVersion: "3.5.17"},
{Version: "3.5.7", SymlinkToVersion: "3.5.17"},
{Version: "3.5.9", SymlinkToVersion: "3.5.17"},
{Version: "3.5.13", SymlinkToVersion: "3.5.17"},
{Version: "3.5.17", Image: "registry.k8s.io/etcd:3.5.17-0"},
{Version: "3.5.0", SymlinkToVersion: "3.5.13"},
{Version: "3.5.1", SymlinkToVersion: "3.5.13"},
{Version: "3.5.3", SymlinkToVersion: "3.5.13"},
{Version: "3.5.4", SymlinkToVersion: "3.5.13"},
{Version: "3.5.6", SymlinkToVersion: "3.5.13"},
{Version: "3.5.7", SymlinkToVersion: "3.5.13"},
{Version: "3.5.9", SymlinkToVersion: "3.5.13"},
{Version: "3.5.13", Image: "registry.k8s.io/etcd:3.5.13-0"},
}

func etcdSupportedVersions() []etcdVersion {
Expand Down
26 changes: 12 additions & 14 deletions pkg/model/components/etcdmanager/tests/interval/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -160,18 +160,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -274,13 +273,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -302,18 +301,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
26 changes: 12 additions & 14 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -159,18 +159,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -272,13 +271,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -300,18 +299,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
26 changes: 12 additions & 14 deletions pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -162,18 +162,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -278,13 +277,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -306,18 +305,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
26 changes: 12 additions & 14 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -168,18 +168,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -290,13 +289,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.17
- --target-dir=/opt/etcd-v3.5.13
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.17-0
name: init-etcd-3-5-17
image: registry.k8s.io/etcd:3.5.13-0
name: init-etcd-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -318,18 +317,17 @@ Contents: |
- --symlink
- --target-dir=/opt/etcd-v3.5.0
- --target-dir=/opt/etcd-v3.5.1
- --target-dir=/opt/etcd-v3.5.13
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.17/etcd
- --src=/opt/etcd-v3.5.17/etcdctl
- --src=/opt/etcd-v3.5.13/etcd
- --src=/opt/etcd-v3.5.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
name: init-etcd-symlinks-3-5-17
name: init-etcd-symlinks-3-5-13
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
4 changes: 2 additions & 2 deletions ...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
backupRetentionDays: 90
memoryRequest: 100Mi
name: main
version: 3.5.17
version: 3.5.13
- backups:
backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events
cpuRequest: 100m
Expand All @@ -54,7 +54,7 @@ spec:
backupRetentionDays: 90
memoryRequest: 100Mi
name: events
version: 3.5.17
version: 3.5.13
externalDns:
provider: dns-controller
iam:
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.17"
"etcdVersion": "3.5.13"
}
2 changes: 1 addition & 1 deletion ...ration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.17"
"etcdVersion": "3.5.13"
}
Loading
Loading