Skip to content

[bug] resolve kubectl image version with special case #110

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

Merged
merged 1 commit into from
Oct 9, 2024
Merged

[bug] resolve kubectl image version with special case #110

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 pkg/helm/chartOption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type ChartOption struct {
UseCustomValues bool
}

func determineTag(ctx context.Context, k8sv string, img *registry.Image, plainHTTP bool) bool {
func determineTag(ctx context.Context, img *registry.Image, plainHTTP bool) bool {

reg, repo, name := img.Elements()
ref := fmt.Sprintf("%s/%s/%s", reg, repo, name)
Expand All @@ -101,12 +101,6 @@ func determineTag(ctx context.Context, k8sv string, img *registry.Image, plainHT
return true
}

available, _ = registry.Exist(ctx, ref, k8sv, plainHTTP)
if available {
img.Tag = k8sv
return true
}

return false
}

Expand Down Expand Up @@ -317,10 +311,6 @@ func (co ChartOption) Run(ctx context.Context, setters ...Option) (ChartData, er

eg, egCtx := errgroup.WithContext(egCtx)
for i, helmValuePaths := range imageMap {
if i.Tag == "" {
// If tag is empty in values.yaml, use App Version by convention
i.Tag = chart.Metadata.AppVersion
}

func(i *registry.Image, helmValuePaths []string) {
eg.Go(func() error {
Expand All @@ -330,9 +320,19 @@ func (co ChartOption) Run(ctx context.Context, setters ...Option) (ChartData, er
i.Registry = reg
i.Repository = fmt.Sprintf("%s/%s", repo, name)

if i.Tag == "" {
switch name {
case "kubectl":
i.Tag = args.K8SVersion
default:
// If tag is empty in values.yaml, use App Version by convention
i.Tag = chart.Metadata.AppVersion
}
}

plainHTTP := strings.Contains(i.Registry, "localhost") || strings.Contains(i.Registry, "0.0.0.0")

available := determineTag(egCtx, args.K8SVersion, i, plainHTTP)
available := determineTag(egCtx, i, plainHTTP)

// send availability response
channel <- &imageInfo{available, c, i, &helmValuePaths}
Expand Down
Loading