Skip to content

OTA-925: pkg/steps/release/import_release: Set release.openshift.io/config name annotation #3350

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
openshift-merge-robot merged 1 commit into from
Mar 31, 2023
Merged

OTA-925: pkg/steps/release/import_release: Set release.openshift.io/config name annotation #3350

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
18 changes: 18 additions & 0 deletions pkg/steps/release/import_release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"strings"
"time"

"github.com/blang/semver"
"github.com/sirupsen/logrus"

coreapi "k8s.io/api/core/v1"
Expand Down Expand Up @@ -235,13 +236,30 @@ oc create configmap release-%s --from-file=%s.yaml=${ARTIFACT_DIR}/%s
return fmt.Errorf("unexpected image stream contents: %w", err)
}

var prefix string
version, err := semver.Parse(releaseIS.ObjectMeta.Name)
if err != nil {
logrus.WithError(err).Errorf("Failed to parse release %s ImageStream name %s as a semantic version.", pullSpec, releaseIS.ObjectMeta.Name)
} else {
prefix = fmt.Sprintf("%d.%d.%d-0", version.Major, version.Minor, version.Patch)
}

// update the stable image stream to have all of the tags from the payload
if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
stable := &imagev1.ImageStream{}
if err := s.client.Get(ctx, ctrlruntimeclient.ObjectKey{Namespace: s.jobSpec.Namespace(), Name: streamName}, stable); err != nil {
return fmt.Errorf("could not resolve imagestream %s: %w", streamName, err)
}

if prefix != "" {
if stable.ObjectMeta.Annotations == nil {
stable.ObjectMeta.Annotations = make(map[string]string, 1)
}
if _, ok := stable.ObjectMeta.Annotations[releaseConfigAnnotation]; !ok {
stable.ObjectMeta.Annotations[releaseConfigAnnotation] = fmt.Sprintf(`{"name": "%s"}`, prefix)
}
}

existing := sets.NewString()
tags := make([]imagev1.TagReference, 0, len(releaseIS.Spec.Tags)+len(stable.Spec.Tags))
for _, tag := range releaseIS.Spec.Tags {
Expand Down