Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

test: Bump Cilium version #1223

Merged
merged 1 commit into from
Jul 7, 2020
Merged

test: Bump Cilium version #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions internal/pkg/skuba/addons/cilium_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ func TestGetCiliumInitImage(t *testing.T) {
}{
{
name: "get cilium init image without revision",
imageTag: "1.5.3",
want: img.ImageRepository + "/cilium-init:1.5.3",
imageTag: "1.7.5",
want: img.ImageRepository + "/cilium-init:1.7.5",
},
{
name: "get cilium init image with revision",
imageTag: "1.5.3-rev2",
want: img.ImageRepository + "/cilium-init:1.5.3-rev2",
imageTag: "1.7.5-rev2",
want: img.ImageRepository + "/cilium-init:1.7.5-rev2",
},
}
for _, tt := range tests {
Expand All @@ -63,13 +63,13 @@ func TestGetCiliumOperatorImage(t *testing.T) {
}{
{
name: "get cilium operator image without revision",
imageTag: "1.5.3",
want: img.ImageRepository + "/cilium-operator:1.5.3",
imageTag: "1.7.5",
want: img.ImageRepository + "/cilium-operator:1.7.5",
},
{
name: "get cilium operator image with revision",
imageTag: "1.5.3-rev2",
want: img.ImageRepository + "/cilium-operator:1.5.3-rev2",
imageTag: "1.7.5-rev2",
want: img.ImageRepository + "/cilium-operator:1.7.5-rev2",
},
}
for _, tt := range tests {
Expand All @@ -90,13 +90,13 @@ func TestGetCiliumImage(t *testing.T) {
}{
{
name: "get cilium image without revision",
imageTag: "1.5.3",
want: img.ImageRepository + "/cilium:1.5.3",
imageTag: "1.7.5",
want: img.ImageRepository + "/cilium:1.7.5",
},
{
name: "get cilium image with revision",
imageTag: "1.5.3-rev2",
want: img.ImageRepository + "/cilium:1.5.3-rev2",
imageTag: "1.7.5-rev2",
want: img.ImageRepository + "/cilium:1.7.5-rev2",
},
}
for _, tt := range tests {
Expand Down
12 changes: 6 additions & 6 deletions internal/pkg/skuba/upgrade/addon/versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ func TestHasAddonUpdate(t *testing.T) {
name: "has addon update",
aviu: AddonVersionInfoUpdate{
Current: kubernetes.AddonsVersion{
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.5.3", ManifestVersion: 0},
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.7.5", ManifestVersion: 0},
kubernetes.Kured: &kubernetes.AddonVersion{Version: "1.2.0", ManifestVersion: 0},
kubernetes.Dex: &kubernetes.AddonVersion{Version: "2.16.0", ManifestVersion: 0},
kubernetes.Gangway: &kubernetes.AddonVersion{Version: "3.1.0", ManifestVersion: 0},
kubernetes.PSP: &kubernetes.AddonVersion{Version: "1.0.0", ManifestVersion: 1},
},
Updated: kubernetes.AddonsVersion{
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.5.3", ManifestVersion: 1},
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.7.5", ManifestVersion: 1},
},
},
expected: true,
Expand All @@ -180,7 +180,7 @@ func TestHasAddonUpdate(t *testing.T) {
name: "no addon update",
aviu: AddonVersionInfoUpdate{
Current: kubernetes.AddonsVersion{
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.5.3", ManifestVersion: 0},
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.7.5", ManifestVersion: 0},
kubernetes.Kured: &kubernetes.AddonVersion{Version: "1.2.0", ManifestVersion: 0},
kubernetes.Dex: &kubernetes.AddonVersion{Version: "2.16.0", ManifestVersion: 0},
kubernetes.Gangway: &kubernetes.AddonVersion{Version: "3.1.0", ManifestVersion: 0},
Expand All @@ -206,20 +206,20 @@ func TestHasAddonUpdate(t *testing.T) {
func ExamplePrintAddonUpdates() {
PrintAddonUpdates(AddonVersionInfoUpdate{
Current: kubernetes.AddonsVersion{
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.5.3", ManifestVersion: 0},
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.7.5", ManifestVersion: 0},
kubernetes.Kured: &kubernetes.AddonVersion{Version: "1.2.0", ManifestVersion: 0},
kubernetes.Dex: &kubernetes.AddonVersion{Version: "2.16.0", ManifestVersion: 1},
kubernetes.Gangway: nil,
},
Updated: kubernetes.AddonsVersion{
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.5.3", ManifestVersion: 1},
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.7.5", ManifestVersion: 1},
kubernetes.Dex: &kubernetes.AddonVersion{Version: "2.17.0", ManifestVersion: 1},
kubernetes.Gangway: &kubernetes.AddonVersion{Version: "3.1.0", ManifestVersion: 0},
},
})

// Output:
// - cilium: 1.5.3 (manifest version from 0 to 1)
// - cilium: 1.7.5 (manifest version from 0 to 1)
// - dex: 2.16.0 -> 2.17.0
// - gangway: 3.1.0 (new addon)
}
2 changes: 1 addition & 1 deletion internal/pkg/skuba/upgrade/node/versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func versionInquirer(versions ...string) kubernetes.VersionInquirer {
kubernetes.Tooling: &kubernetes.ContainerImageTag{Name: "skuba-tooling", Tag: "0.1.0"},
},
AddonsVersion: kubernetes.AddonsVersion{
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.5.3", ManifestVersion: 0},
kubernetes.Cilium: &kubernetes.AddonVersion{Version: "1.7.5", ManifestVersion: 0},
kubernetes.Kured: &kubernetes.AddonVersion{Version: "1.2.0", ManifestVersion: 0},
},
}
Expand Down