Merge main into fnconf-improv-1

.github/actions/setup-go-kpt/action.yml

@@ -1,4 +1,4 @@
-# Copyright 2026 The Nephio Authors
+# Copyright 2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/golangci-lint.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024-2025 The Nephio Authors
+# Copyright 2024-2025 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/gosec-scan.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024, 2026 The Nephio Authors
+# Copyright 2024, 2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/image-build-push-dev.yaml

@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   build-and-push-image:
-    if: github.repository_owner == 'nephio-project'
+    if: github.repository_owner == 'kptdev'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/image-build-push-release.yaml

@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   build-and-push-image:
-    if: github.repository_owner == 'nephio-project'
+    if: github.repository_owner == 'kptdev'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/porch-compat-matrix.yaml

@@ -1,4 +1,4 @@
-# Copyright 2026 The Nephio Authors
+# Copyright 2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ jobs:
         id: releases
         env:
           GH_TOKEN: ${{ github.token }}
-          UPSTREAM_REPO: nephio-project/porch
+          UPSTREAM_REPO: kptdev/porch
         run: |
           # Always query upstream repo for releases (works correctly from forks)
           VERSIONS=$(gh api repos/${UPSTREAM_REPO}/releases \
@@ -80,14 +80,14 @@ jobs:
         if: matrix.server_version == 'latest'
         uses: actions/checkout@v4
         with:
-          repository: nephio-project/porch
+          repository: kptdev/porch
           ref: '1.5' # NOTE this should revert back to main when we merge back
 
       - name: Checkout upstream tag ${{ matrix.server_version }}
         if: matrix.server_version != 'latest'
         uses: actions/checkout@v4
         with:
-          repository: nephio-project/porch
+          repository: kptdev/porch
           ref: ${{ matrix.server_version }}
 
       # --- Step 2: Setup tooling ---
@@ -148,7 +148,7 @@ jobs:
 
       - name: Download released CLI versions
         run: |
-          UPSTREAM_REPO="nephio-project/porch"
+          UPSTREAM_REPO="kptdev/porch"
           for VERSION in $(echo "$RELEASES" | jq -r '.[]'); do
             VERSION_NUM="${VERSION#v}"
             CLI_URL="https://github.com/${UPSTREAM_REPO}/releases/download/${VERSION}/porchctl_${VERSION_NUM}_linux_amd64.tar.gz"

.github/workflows/porch-e2e-ci-jobs.yaml

@@ -1,4 +1,4 @@
-# Copyright 2025-2026 The Nephio Authors
+# Copyright 2025-2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/porchctl-dev-release.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024, 2026 The Nephio Authors
+# Copyright 2024, 2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/release.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024,2026 The Nephio Authors
+# Copyright 2024,2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/sonarcloud.yml

@@ -87,7 +87,7 @@ jobs:
 
     - name: Fix Go module paths in coverage
       run: |
-        sed -i 's|github.com/nephio-project/porch|.|g' coverage.out
+        sed -i 's|github.com/kptdev/porch|.|g' coverage.out
 
     - name: SonarQube Scan on PR
       if: github.event.workflow_run.event == 'pull_request'
@@ -96,8 +96,8 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       with:
         args:
-          -Dsonar.projectKey=nephio-project_porch
-          -Dsonar.organization=nephio-project
+          -Dsonar.projectKey=kptdev_porch
+          -Dsonar.organization=kptdev
           -Dproject.settings=sonar-project.properties
           -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} 
           -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} 
@@ -110,6 +110,6 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       with:
         args:
-          -Dsonar.projectKey=nephio-project_porch
-          -Dsonar.organization=nephio-project
+          -Dsonar.projectKey=kptdev_porch
+          -Dsonar.organization=kptdev
           -Dproject.settings=sonar-project.properties

.mockery.yaml

@@ -20,22 +20,22 @@ packages:
         config:
           dir: "test/mockery/mocks/external/sigs.k8s.io/controller-runtime/pkg/client"
 
-  github.com/nephio-project/porch/pkg/cache/crcache/meta:
+  github.com/kptdev/porch/pkg/cache/crcache/meta:
     interfaces:
       MetadataStore: {}
 
-  github.com/nephio-project/porch/pkg/cache/dbcache:
+  github.com/kptdev/porch/pkg/cache/dbcache:
     interfaces:
       dbSQLInterface:
         config:
           structname: "MockdbSQLInterface"
 
-  github.com/nephio-project/porch/pkg/cache/types:
+  github.com/kptdev/porch/pkg/cache/types:
     interfaces:
       Cache: {}
       RepoPRChangeNotifier: {}
 
-  github.com/nephio-project/porch/pkg/repository:
+  github.com/kptdev/porch/pkg/repository:
     interfaces:
       Repository: {}
       PackageRevision: {}
@@ -44,7 +44,7 @@ packages:
       PackageContent: {}
       ExternalPackageFetcher: {}
 
-  github.com/nephio-project/porch/pkg/engine:
+  github.com/kptdev/porch/pkg/engine:
     interfaces:
       CaDEngine: {}
       WatcherManager: {}

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "sonarlint.connectedMode.project": {
-        "connectionId": "nephio-project",
-        "projectKey": "nephio-project_porch"
+        "connectionId": "kptdev",
+        "projectKey": "kptdev_porch"
     },
     "go.testEnvVars": {
       "RUN_E2E_LOCALLY": "false",

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2022-2026 The kpt and Nephio Authors
+# Copyright 2022-2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

README.md

@@ -3,9 +3,9 @@
 Package Orchestration Server (a.k.a. Porch) is a k8s extension apiserver
 which manages the lifecycle of KRM configuration packages.
 
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nephio-project/porch/badge)](https://securityscorecards.dev/viewer/?uri=github.com/nephio-project/porch) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10062/badge)](https://www.bestpractices.dev/projects/10062)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/kptdev/porch/badge)](https://securityscorecards.dev/viewer/?uri=github.com/kptdev/porch) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10062/badge)](https://www.bestpractices.dev/projects/10062)
 
-This code was donated to Nephio from the [kpt](https://github.com/kptdev/kpt)
+This code was donated to Kptdev from the [kpt](https://github.com/kptdev/kpt)
 project as of December 2023.
 
 ## Documentation

SECURITY.md

@@ -1,15 +1,15 @@
 # Security Policy
 
-We're extremely grateful for security researchers and users that report vulnerabilities to the Nephio Open Source Community. 
+We're extremely grateful for security researchers and users that report vulnerabilities to the kpt Open Source Community. 
 All reports are thoroughly investigated by a set of community volunteers.
 
-The Nephio community has adopted the security disclosures and response policy below to respond to security issues.
+The kpt community has adopted the security disclosures and response policy below to respond to security issues.
 
 Please do not report security vulnerabilities through public GitHub issues.
 
 ## Supported Versions
 
-The following versions of Nephio project are currently being supported with security updates.
+The following versions of kpt project are currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
@@ -18,17 +18,17 @@ The following versions of Nephio project are currently being supported with secu
 ## Reporting a Vulnerability
 
 ### When should you?
-- You think you discovered a potential security vulnerability in Nephio.
-- You are unsure how a vulnerability affects Nephio.
-- You think you discovered a vulnerability in a dependency of Nephio. For those projects, please leverage their reporting policy.
+- You think you discovered a potential security vulnerability in kpt.
+- You are unsure how a vulnerability affects kpt.
+- You think you discovered a vulnerability in a dependency of kpt. For those projects, please leverage their reporting policy.
 
 ### When you should not?
-- You need assistance in configuring Nephio for security - please discuss this is in the [slack channel](https://nephio.slack.com/archives/C05UXLPF4V6).
+- You need assistance in configuring kpt for security - please discuss this on one of the [kpt communication channels](https://kpt.dev/#communication).
 - You need help applying security-related updates.
 - Your issue is not security-related.
 
 ### Please use the process below to report a vulnerability to the project:
-1. Email the **Nephio security group at sig-security@lists.nephio.org**
+1. Contact the [kpt code owners](https://github.com/kptdev/kpt/blob/main/CODEOWNERS)
 
     * Please include the information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
         * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
@@ -46,9 +46,9 @@ The following versions of Nephio project are currently being supported with secu
 3. You may be contacted by a project maintainer to further discuss the reported item. Please bear with us as we seek to understand the breadth and scope of the reported problem, recreate it, and confirm if there is a vulnerability present.
 
 ## Security bulletins
-For information regarding the security of this project please join our [slack channel](https://nephio.slack.com/archives/C05UXLPF4V6).
+For information regarding the security of this project please join our [kpt communication channels](https://kpt.dev/#communication).
 
 ## Public Disclosure Timing
-A public disclosure date is negotiated by the Nephio Security Response Committee and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to a few weeks. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days. The Nephio Security Response Committee holds the final say when setting a disclosure date.
+A public disclosure date is negotiated by the kpt Security Response Committee and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to a few weeks. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days. The kpt Security Response Committee holds the final say when setting a disclosure date.
 
 

api/doc.go

@@ -1,4 +1,4 @@
-// Copyright 2022 The kpt and Nephio Authors
+// Copyright 2022 The kpt Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.