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

Update Calico to v3.27.0 #16192

Merged
merged 3 commits into from
Dec 27, 2023
Merged

Update Calico to v3.27.0 #16192

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
f2d9193
Update Calico to v3.27.0
hakman Dec 27, 2023
212f0e8
hack/update-expected.sh
hakman Dec 27, 2023
b8a52fd
Set validation interval only when higher than 10s
hakman Dec 27, 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
4 changes: 3 additions & 1 deletion tests/e2e/kubetest2-kops/deployer/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,11 @@ func (d *deployer) IsUp() (bool, error) {
d.KopsBinaryPath, "validate", "cluster",
"--name", d.ClusterName,
"--count", strconv.Itoa(d.ValidationCount),
"--interval", d.ValidationInterval.String(),
"--wait", wait.String(),
}
if d.ValidationInterval > 10*time.Second {
args = append(args, "--interval", d.ValidationInterval.String())
}
Comment on lines +297 to +299
Copy link
Member Author

@hakman hakman Dec 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For compatibility with older kOps versions that don't support this new flag, like pull-kops-e2e-aws-upgrade-k127-ko127-to-klatest-kolatest-many-addons.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@upodroid ^^^

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed it today :(

klog.Info(strings.Join(args, " "))

cmd := exec.Command(args[0], args[1:]...)
Expand Down
2 changes: 1 addition & 1 deletion .../minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.25
manifest: networking.projectcalico.org/k8s-1.25.yaml
manifestHash: 123b89a7c5832c2479741310c8ae2a121000365ab4c8c5bcf43de9527ce55452
manifestHash: 77dd86f0456cd77fd3209ee5e2a992443e8c2caeca038f1d00645271d0e9689f
name: networking.projectcalico.org
prune:
kinds:
Expand Down
Loading
Loading