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

fix for sporadic porch crash during new package revision #160

Merged
merged 6 commits into from
Dec 16, 2024
Merged

fix for sporadic porch crash during new package revision #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4bb5e0
fix for sporadic porch crash during new package revision
sriharshabm Dec 12, 2024
72b00ee
fix for sporadic porch crash during new package revision
sriharshabm Dec 12, 2024
cc610c5
fix for sporadic porch crash during new package revision
sriharshabm Dec 12, 2024
1fc657a
fix for sporadic porch crash during new package revision
sriharshabm Dec 12, 2024
639a609
Update controllers/packagevariants/pkg/controllers/packagevariant/inj…
kispaljr Dec 13, 2024
93acdfe
Update controllers/packagevariants/pkg/controllers/packagevariant/pac…
kispaljr Dec 13, 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
7 changes: 5 additions & 2 deletions controllers/packagevariants/pkg/controllers/packagevariant/injection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 The kpt and Nephio Authors
// Copyright 2023-2024 The kpt and Nephio Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -119,7 +119,10 @@ func ensureConfigInjection(ctx context.Context,
return err
}

setInjectionPointConditionsAndGates(kptfile, injectionPoints)
err = setInjectionPointConditionsAndGates(kptfile, injectionPoints)
if err != nil {
sriharshabm marked this conversation as resolved.
Show resolved Hide resolved
return err
}

prr.Spec.Resources["Kptfile"] = kptfile.String()

Expand Down
10 changes: 9 additions & 1 deletion controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 The kpt and Nephio Authors
// Copyright 2023-2024 The kpt and Nephio Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -596,7 +596,15 @@ func (r *PackageVariantReconciler) deletePackageRevision(ctx context.Context, pr

// determine if the downstream PR needs to be updated
func (r *PackageVariantReconciler) isUpToDate(pv *api.PackageVariant, downstream *porchapi.PackageRevision) bool {
if downstream.Status.UpstreamLock == nil {
klog.Warningf("status.upstreamLock field is empty/missing in downstream PackageRevision: %s", pv.ObjectMeta.Name)
return true
}
upstreamLock := downstream.Status.UpstreamLock
if upstreamLock.Git == nil || upstreamLock.Git.Ref == "" {
klog.Warningf("status.upstreamLock.git or status.upstreamLock.git.ref field is empty/missing in downstream PackageRevision: %s", pv.ObjectMeta.Name)
return true
}
lastIndex := strings.LastIndex(upstreamLock.Git.Ref, "/")
if strings.HasPrefix(upstreamLock.Git.Ref, "drafts") {
// The current upstream is a draft, and the target upstream
Expand Down
Loading