Skip to content
This repository has been archived by the owner on Apr 7, 2020. It is now read-only.

Commit

Permalink
Circumvent image vector issues for Alicloud
Browse files Browse the repository at this point in the history
  • Loading branch information
rfranzke committed Jun 25, 2019
1 parent 65edd60 commit c2da160
Showing 1 changed file with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ var controlPlaneChart = &chart.Chart{
},
},
{
Name: "csi-alicloud",
Images: []string{alicloud.CSIAttacherImageName, alicloud.CSIProvisionerImageName, alicloud.CSISnapshotterImageName, alicloud.CSIPluginImageName},
Name: "csi-alicloud",
// TODO Uncomment again when image vector is enhanced to support specifying the shoot version
// Images: []string{alicloud.CSIAttacherImageName, alicloud.CSIProvisionerImageName, alicloud.CSISnapshotterImageName, alicloud.CSIPluginImageName},
Objects: []*chart.Object{
{Type: &appsv1.Deployment{}, Name: "csi-plugin-controller"},
},
Expand Down Expand Up @@ -346,9 +347,12 @@ func getControlPlaneChartValues(
) (map[string]interface{}, error) {
// Inject CSI images explicitly to make sure that the correct images for the shoot version are injected
// TODO Remove when image vector is enhanced to support specifying the shoot version
var err error
var csiValues map[string]interface{}
if csiValues, err = chart.InjectImages(csiValues, alicloudimagevector.ImageVector(), controlPlaneChart.SubCharts[1].Images,
var (
err error
csiValues map[string]interface{}
csiImages = []string{alicloud.CSIAttacherImageName, alicloud.CSIProvisionerImageName, alicloud.CSISnapshotterImageName, alicloud.CSIPluginImageName}
)
if csiValues, err = chart.InjectImages(csiValues, alicloudimagevector.ImageVector(), csiImages,
imagevector.RuntimeVersion(cluster.Shoot.Spec.Kubernetes.Version), imagevector.TargetVersion(cluster.Shoot.Spec.Kubernetes.Version)); err != nil {
return nil, errors.Wrap(err, "could not inject CSI images")
}
Expand Down

0 comments on commit c2da160

Please sign in to comment.