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

CNTRLPLANE-25: Fix valid release image update issue #5316

Merged
merged 2 commits into from
Dec 19, 2024
+11 −6
Merged

CNTRLPLANE-25: Fix valid release image update issue #5316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c125ab
Fix spelling mistakes found in codespell
bryan-cox Dec 18, 2024
92a0917
Get HCP before Valid Release Image status patch
bryan-cox Dec 18, 2024
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
Next Next commit
Fix spelling mistakes found in codespell 
Signed-off-by: Bryan Cox <brcox@redhat.com>
  • Loading branch information
@bryan-cox
bryan-cox committed Dec 18, 2024
commit 6c125abcb9a6c9275ff0201cce61b4b509264aa1
2 changes: 1 addition & 1 deletion hypershift-operator/controllers/hostedcluster/karpenter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
}

// Managed a NodePool to generate userData for Karpenter instances
// TODO(alberto): consider invoking the token library to manage the karpenter userdata programatically,
// TODO(alberto): consider invoking the token library to manage the karpenter userdata programmatically,
// instead of via NodePool API.
nodePool := &hyperv1.NodePool{
ObjectMeta: metav1.ObjectMeta{
Expand Down
2 changes: 1 addition & 1 deletion karpenter-operator/controllers/karpenter/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ func (r *Reconciler) reconcileKarpenter(ctx context.Context, hcp *hyperv1.Hosted

// The deployment depends on the kubeconfig being reported.
if hcp.Status.KubeConfig != nil {
// Resolve the kubeconfig secret for CAPI which is used for karpeneter for convience
// Resolve the kubeconfig secret for CAPI which is used for karpeneter for convenience
capiKubeConfigSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Namespace: hcp.Namespace,
Expand Down
2 changes: 1 addition & 1 deletion karpenter-operator/manifests/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func ReconcileKarpenterOperator(ctx context.Context, createOrUpdate upsert.Creat

// The deployment depends on the kubeconfig being reported.
if hcp.Status.KubeConfig != nil {
// Resolve the kubeconfig secret for CAPI which is used for karpeneter for convience
// Resolve the kubeconfig secret for CAPI which is used for karpeneter for convenience
capiKubeConfigSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Namespace: hcp.Namespace,
Expand Down
2 changes: 1 addition & 1 deletion support/releaseinfo/registryclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ func IsMultiArchManifestList(ctx context.Context, imageRef string, pullSecret []
return false, nil
}

// Default to using the deserializeManifest function, but allow for a custom deserialization function to be passed in the context for testing purposes and avoiding paralelism issues
// Default to using the deserializeManifest function, but allow for a custom deserialization function to be passed in the context for testing purposes and avoiding parallelism issues
deserializeFunc := deserializeManifest
if ctx.Value(DeserializeFuncName) != nil {
deserializeFunc = ctx.Value(DeserializeFuncName).(func([]byte) (*manifestlist.DeserializedManifestList, error))
Expand Down
4 changes: 2 additions & 2 deletions support/util/imagemetadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (r *RegistryClientImageMetadataProvider) GetDigest(ctx context.Context, ima

composedRef := fmt.Sprintf("%s/%s/%s", ref.Registry, ref.Namespace, ref.NameString())

// If the overriden image name is in the cache, return early
// If the overridden image name is in the cache, return early
if imageDigest, exists := digestCache.Get(composedRef); exists {
ref.ID = string(imageDigest.(digest.Digest))
return imageDigest.(digest.Digest), ref, nil
Expand Down Expand Up @@ -400,7 +400,7 @@ func GetRegistryOverrides(ctx context.Context, ref reference.DockerImageReferenc
}

// docker lib, by default will empty the Namespace once we pass an override with just a Namespace
// and it will asume that is the Name instead
// and it will assume that is the Name instead
if sourceRef.Namespace == "" {
if sourceRef.Name == ref.Namespace {
composedImage := fmt.Sprintf("%s/%s/%s", mirrorRef.Registry, ref.Namespace, ref.NameString())
Expand Down