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

CSI: Updates CSI images to the latest version (#1187) #1192

Merged
merged 1 commit into from
Aug 8, 2023
Merged

CSI: Updates CSI images to the latest version (#1187) #1192

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
2 changes: 1 addition & 1 deletion drivers/storage/portworx/manifest/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ func TestManifestWithPartialComponents(t *testing.T) {
rel = m.GetVersions(cluster, true)
require.Equal(t, expected.PortworxVersion, rel.PortworxVersion)
require.Equal(t, defaultRelease(k8sVersion).Components, rel.Components)
require.Equal(t, "registry.k8s.io/sig-storage/csi-provisioner:v3.3.0", rel.Components.CSIProvisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0", rel.Components.CSIProvisioner)

// TestCase: No components at all, without k8s version
expected.Components = Release{}
Expand Down
10 changes: 5 additions & 5 deletions drivers/storage/portworx/util/csi_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ func (c *CSIConfiguration) DriverBasePath() string {
}

func (g *CSIGenerator) getSidecarContainerVersionsV1_0() *CSIImages {
provisionerImage := k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-provisioner:v3.3.0"
snapshotterImage := k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-snapshotter:v6.1.0"
snapshotControllerImage := k8sutil.DefaultK8SRegistryPath + "/sig-storage/snapshot-controller:v6.1.0"
provisionerImage := k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-provisioner:v3.5.0"
snapshotterImage := k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-snapshotter:v6.2.2"
snapshotControllerImage := k8sutil.DefaultK8SRegistryPath + "/sig-storage/snapshot-controller:v6.2.2"

// Provisioner fork can only be removed in PX 2.13 and later.
if g.pxVersion.LessThan(pxVer2_13) {
Expand All @@ -288,10 +288,10 @@ func (g *CSIGenerator) getSidecarContainerVersionsV1_0() *CSIImages {

return &CSIImages{
Attacher: "docker.io/openstorage/csi-attacher:v1.2.1-1",
NodeRegistrar: k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-node-driver-registrar:v2.6.2",
NodeRegistrar: k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-node-driver-registrar:v2.8.0",
Provisioner: provisionerImage,
Snapshotter: snapshotterImage,
Resizer: k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-resizer:v1.6.0",
Resizer: k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-resizer:v1.8.0",
SnapshotController: snapshotControllerImage,
HealthMonitorController: k8sutil.DefaultK8SRegistryPath + "/sig-storage/csi-external-health-monitor-controller:v0.7.0",
}
Expand Down
44 changes: 22 additions & 22 deletions drivers/storage/portworx/util/csi_generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,67 +19,67 @@ func TestCSIImages(t *testing.T) {
gen = NewCSIGenerator(*k8sVersion, version.Version{}, false, false, "", false)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "docker.io/openstorage/csi-provisioner:v1.6.1-1", images.Provisioner)
require.Equal(t, "quay.io/openstorage/csi-snapshotter:v1.2.2-1", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)

k8sVersion, _ = version.NewSemver("1.14.5")
gen = NewCSIGenerator(*k8sVersion, version.Version{}, false, false, "", false)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "docker.io/openstorage/csi-provisioner:v1.6.1-1", images.Provisioner)
require.Equal(t, "docker.io/openstorage/csi-snapshotter:v1.2.2-1", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)

k8sVersion, _ = version.NewSemver("1.18.5")
gen = NewCSIGenerator(*k8sVersion, version.Version{}, false, false, "", false)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "docker.io/openstorage/csi-provisioner:v2.2.2-1", images.Provisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)

k8sVersion, _ = version.NewSemver("1.20.4")
gen = NewCSIGenerator(*k8sVersion, version.Version{}, false, false, "", false)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "docker.io/openstorage/csi-provisioner:v3.2.1-1", images.Provisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)

k8sVersion, _ = version.NewSemver("1.20.4")
gen = NewCSIGenerator(*k8sVersion, version.Version{}, false, false, "", true)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "docker.io/openstorage/csi-provisioner:v3.2.1-1", images.Provisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/snapshot-controller:v6.1.0", images.SnapshotController)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/snapshot-controller:v6.2.2", images.SnapshotController)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)

k8sVersion, _ = version.NewSemver("1.23.4")
gen = NewCSIGenerator(*k8sVersion, *pxVer2_10, false, false, "", true)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "docker.io/openstorage/csi-provisioner:v3.2.1-1", images.Provisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/snapshot-controller:v6.1.0", images.SnapshotController)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/snapshot-controller:v6.2.2", images.SnapshotController)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.7.0", images.HealthMonitorController)

k8sVersion, _ = version.NewSemver("1.23.4")
gen = NewCSIGenerator(*k8sVersion, *pxVer2_13, false, false, "", true)
images = gen.GetCSIImages()
require.Equal(t, "docker.io/openstorage/csi-attacher:v1.2.1-1", images.Attacher)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-provisioner:v3.3.0", images.Provisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/snapshot-controller:v6.1.0", images.SnapshotController)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.6.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0", images.NodeRegistrar)
require.Equal(t, "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0", images.Provisioner)
require.Equal(t, "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2", images.Snapshotter)
require.Equal(t, "registry.k8s.io/sig-storage/snapshot-controller:v6.2.2", images.SnapshotController)
require.Equal(t, "registry.k8s.io/sig-storage/csi-resizer:v1.8.0", images.Resizer)
require.Equal(t, "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.7.0", images.HealthMonitorController)
}
4 changes: 2 additions & 2 deletions test/integration_test/testspec/migration/daemonset-with-all-components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ spec:
- name: dbusmount
mountPath: /var/run/dbus
- name: csi-node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
imagePullPolicy: Always
args:
- "--v=5"
Expand Down Expand Up @@ -363,7 +363,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.6.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
imagePullPolicy: Always
args:
- "--v=3"
Expand Down
Loading