[4.2] addons: List cilium-init image only for Cilium < 1.6

[vadorovsky]

We don't ship a separate cilium-init image anymore. The cilium-init
script is included in the main cilium container image.

Fixes: SUSE/avant-garde#1923

Signed-off-by: Michal Rostecki mrostecki@opensuse.org

[soumynathan]

Looks good to me.

[mmnelemane]

Isnt it possible to plainly skip the test altogether if the version is above 1.6 instead of running a dummy string test ?

[mmnelemane]

Is it possible to skip the call to GetCiliumInitImage() here instead of passing an empty string ?

[vadorovsky]

Isnt it possible to plainly skip the test altogether if the version is above 1.6 instead of running a dummy string test ?

What do you mean?

Is it possible to skip the call to GetCiliumInitImage() here instead of passing an empty string ?

Not really. Look here:

skuba/internal/pkg/skuba/addons/cilium.go

Lines 33 to 35 in a019c91

	func init() {
	registerAddon(kubernetes.Cilium, renderCiliumTemplate, renderCiliumPreflightTemplate, ciliumCallbacks{}, normalPriority, []getImageCallback{GetCiliumInitImage, GetCiliumOperatorImage, GetCiliumImage})
	}

[]getImageCallback{GetCiliumInitImage, GetCiliumOperatorImage, GetCiliumImage}

The registerAddon function expects the full slice with getImageCallback functions. Since it's called in the init function, you cannot pass any arguments there, so you can't determine the version when callbacks are registered.

Honesly, I don't think there is any better way of handling different versions without a huge rewrite of the whole addons mechanism, but I'm open for suggestions.

Also, keep in mind that this is a backport and the same change is already merged in master (#1396). So if there is any other way of handling the <1.6 case which would be better for you, we would need to push it to master first.

[mmnelemane]

Isnt it possible to plainly skip the test altogether if the version is above 1.6 instead of running a dummy string test ?

What do you mean?

Is it possible to skip the call to GetCiliumInitImage() here instead of passing an empty string ?

Not really. Look here:

skuba/internal/pkg/skuba/addons/cilium.go

Lines 33 to 35 in a019c91

	func init() {
	registerAddon(kubernetes.Cilium, renderCiliumTemplate, renderCiliumPreflightTemplate, ciliumCallbacks{}, normalPriority, []getImageCallback{GetCiliumInitImage, GetCiliumOperatorImage, GetCiliumImage})
	}

[]getImageCallback{GetCiliumInitImage, GetCiliumOperatorImage, GetCiliumImage}

The registerAddon function expects the full slice with getImageCallback functions. Since it's called in the init function, you cannot pass any arguments there, so you can't determine the version when callbacks are registered.

Honesly, I don't think there is any better way of handling different versions without a huge rewrite of the whole addons mechanism, but I'm open for suggestions.

Also, keep in mind that this is a backport and the same change is already merged in master (#1396). So if there is any other way of handling the <1.6 case which would be better for you, we would need to push it to master first.

Sorry, I was only referring to the test code here: https://github.com/SUSE/skuba/pull/1397/files#diff-5f300cc81d08e60d6fa85478fa933ba35c084d1d3c2a7b31f5fdc12ac075dda1R50. where you are passing an empty string ? Again, its not very crucial.. just a suggestion. Otherwise Looks Good to me.