Replace 'GoogleContainerTools' references with 'kptdev' in kpt repo

.github/hooks/pre-commit

@@ -2,11 +2,11 @@
 
 echo "Updating docs..."
 make generate;
-diff=`git diff`
+diff=$(git diff)
 
 if [[ $diff != "" ]];
 then 
-        echo "Found unstaged changes [$diff]. Make sure to run `make generate` for updating the docs before you commit the changes."
+        echo "Found unstaged changes [$diff]. Make sure to run \"make generate\" for updating the docs before you commit the changes."
         exit 1
 else 
         exit 0

.github/workflows/checkLicenses.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Go 1.22
+      - name: Set up Go 1.24
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
       - run: |
           ./scripts/create-licenses.sh
       # Upload the licenses list so it's available if needed

.github/workflows/checkSite.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-# disabling href checker https://github.com/GoogleContainerTools/kpt/issues/3157
+# disabling href checker https://github.com/kptdev/kpt/issues/3157
 # Re-enable it by replacing it with robust mechanism
 #      - uses: actions/checkout@v4
 #        with:
@@ -34,7 +34,7 @@ jobs:
 #          path: href-checker
       - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: '24'
       - name: Lint site content
         run: npm i && npm run lint-check
         working-directory: site

.github/workflows/e2eEnvironment.yml

@@ -29,20 +29,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["1.27", "1.28"]
+        version: ["1.32", "1.33"]
     steps:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
       - uses: actions/checkout@v4
       # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
       # If you upgrade this version confirm the changes match your expectations
       - name: Install KinD
-        uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 # v0.5.0
+        uses: engineerd/setup-kind@v0.6.2
         with:
-          version: "v0.20.0"
+          version: "v0.29.0"
           skipClusterCreation: true
+          skipClusterLogsExport: true
       - name: Run Tests
         env:
           K8S_VERSION: ${{ matrix.version }}

.github/workflows/firebase-hosting-merge.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: '24'
       - name: Generate Site
         run: make site-run-server
       - name: Generate sitemap

.github/workflows/go.yml

@@ -48,14 +48,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
         with:
-          path: ${{ env.GOPATH }}/src/github.com/GoogleContainerTools/kpt
+          path: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
       - name: Build, Test, Lint
-        working-directory: ${{ env.GOPATH }}/src/github.com/GoogleContainerTools/kpt
+        working-directory: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
         run: |
           git config --global user.email [email protected]
           git config --global user.name Your Name
@@ -70,31 +70,31 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
         with:
-          path: ${{ env.GOPATH }}/src/github.com/GoogleContainerTools/kpt
+          path: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
       - name: Build
-        working-directory: ${{ env.GOPATH }}/src/github.com/GoogleContainerTools/kpt
+        working-directory: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
         run: |
           make build
 
-# TODO: fix https://github.com/GoogleContainerTools/kpt/issues/3463
+# TODO: fix https://github.com/kptdev/kpt/issues/3463
 #  build-windows:
 #    runs-on: windows-2019
 #    steps:
 #      - name: Set up Go
 #        uses: actions/setup-go@v5
 #        with:
-#          go-version: '>=1.22.4'
+#          go-version: '>=1.24'
 #        id: go
 #      - name: Check out code into the Go module directory
 #        uses: actions/checkout@v4
 #        with:
-#          path: ${{ env.GOPATH }}/src/github.com/GoogleContainerTools/kpt
+#          path: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
 #      - name: Build
-#        working-directory: ${{ env.GOPATH }}/src/github.com/GoogleContainerTools/kpt
+#        working-directory: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
 #        run: |
 #          make build

.github/workflows/live-e2e.yml

@@ -28,20 +28,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31"]
+        version: ["1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d", "1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f"]
     steps:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
       - uses: actions/checkout@v4
       # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
       # If you upgrade this version confirm the changes match your expectations
       - name: Install KinD
-        uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 # v0.5.0
+        uses: engineerd/setup-kind@v0.6.2
         with:
-          version: "v0.20.0"
+          version: "v0.29.0"
           skipClusterCreation: true
+          skipClusterLogsExport: true
+
       - name: Run Tests
         env:
           K8S_VERSION: ${{ matrix.version }}

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
       - name: Checkout
         uses: actions/checkout@v4
         with:

.github/workflows/verifyContent.yml

@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22.4'
+          go-version: '>=1.24'
       - uses: actions/checkout@v4
       - run: |
           make build

.golangci.yml

@@ -14,7 +14,7 @@ linters:
     - errcheck
 # funlen triggers on test functions which it shouldn't
 #    - funlen
-    - exportloopref
+    - copyloopvar
     - gochecknoinits
     - goconst
     - gocritic

Formula/kpt.rb

@@ -14,15 +14,15 @@
 
 class Kpt < Formula
   desc "Toolkit to manage,and apply Kubernetes Resource config data files"
-  homepage "https://googlecontainertools.github.io/kpt"
-  url "https://github.com/GoogleContainerTools/kpt/archive/v1.0.0-beta.49.tar.gz"
+  homepage "https://github.com/kptdev.github.io/kpt"
+  url "https://github.com/kptdev/kpt/archive/v1.0.0-beta.49.tar.gz"
   sha256 "e8f5beb1b4538f0b5d5322cb1600b93728e4a90a975860873883507ee144a262"
 
   depends_on "go" => :build
 
   def install
     ENV["GO111MODULE"] = "on"
-    system "go", "build", "-ldflags", "-X github.com/GoogleContainerTools/kpt/run.version=#{version}", *std_go_args
+    system "go", "build", "-ldflags", "-X github.com/kptdev/kpt/run.version=#{version}", *std_go_args
   end
 
   test do

Makefile

@@ -12,16 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GOLANG_VERSION := 1.22.4
-GORELEASER_CONFIG      = release/tag/goreleaser.yaml
-GORELEASER_IMAGE       := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)
+GOLANG_VERSION    := 1.24.3
+GORELEASER_CONFIG = release/tag/goreleaser.yaml
+GORELEASER_IMAGE  := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)
 
 .PHONY: docs license fix vet fmt lint test build tidy release release-ci
 
 GOBIN := $(shell go env GOPATH)/bin
 GIT_COMMIT := $(shell git rev-parse --short HEAD)
 
-LDFLAGS := -ldflags "-X github.com/GoogleContainerTools/kpt/run.version=${GIT_COMMIT}
+LDFLAGS := -ldflags "-X github.com/kptdev/kpt/run.version=${GIT_COMMIT}
 ifeq ($(OS),Windows_NT)
 	# Do nothing
 else
@@ -51,23 +51,23 @@ update-deps-to-head:
 
 .PHONY: install-mdrip
 install-mdrip:
-	go install github.com/monopole/[email protected].2
+	go install github.com/monopole/[email protected].3
 
 .PHONY: install-kind
 install-kind:
-	go install sigs.k8s.io/kind@v0.13.0
+	go install sigs.k8s.io/kind@v0.29.0
 
 .PHONY: install-golangci-lint
 install-golangci-lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.1
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
 
 .PHONY: install-go-licenses
 install-go-licenses:
-	go install github.com/google/go-licenses@v1.2.0
+	go install github.com/google/go-licenses@v1.6.0
 
 .PHONY: install-swagger
 install-swagger:
-	go install github.com/go-swagger/go-swagger/cmd/swagger@v0.27.0
+	go install github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0
 
 .PHONY: install-mdtogo
 install-mdtogo:
@@ -98,7 +98,7 @@ lint: install-golangci-lint
 	$(GOBIN)/golangci-lint run ./...
 
 license-check: install-go-licenses
-	$(GOBIN)/go-licenses check github.com/GoogleContainerTools/kpt
+	$(GOBIN)/go-licenses check github.com/kptdev/kpt
 
 test:
 	go test -cover ${LDFLAGS} ./...
@@ -131,9 +131,6 @@ test-live-apply: build
 test-live-plan: build
 	PATH=$(GOBIN):$(PATH) go test -v -timeout=20m --tags=kind -p 2 --run=TestLivePlan/testdata/live-plan/$(T)  ./e2e/
 
-test-porch: build
-	PATH=$(GOBIN):$(PATH) go test -v --count=1 --tags=porch ./e2e/
-
 vet:
 	go vet ./...
 
@@ -167,8 +164,8 @@ release-dry-run:
 		--rm \
 		--privileged \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v `pwd`:/go/src/github.com/GoogleContainerTools/kpt \
-		-w /go/src/github.com/GoogleContainerTools/kpt \
+		-v `pwd`:/go/src/github.com/kptdev/kpt \
+		-w /go/src/github.com/kptdev/kpt \
 		$(GORELEASER_IMAGE) \
 		-f "$(GORELEASER_CONFIG)" \
 		--skip=validate,publish
@@ -183,8 +180,8 @@ release:
 		--privileged \
 		--env-file .release-env \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v `pwd`:/go/src/github.com/GoogleContainerTools/kpt \
-		-w /go/src/github.com/GoogleContainerTools/kpt \
+		-v `pwd`:/go/src/github.com/kptdev/kpt \
+		-w /go/src/github.com/kptdev/kpt \
 		$(GORELEASER_IMAGE) \
 		-f "$(GORELEASER_CONFIG)" release \
 		--skip=validate
@@ -200,8 +197,8 @@ release-ci:
 		--env-file .release-env \
 		-v ${HOME}/.docker/config.json:/root/.docker/config.json \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v `pwd`:/go/src/github.com/GoogleContainerTools/kpt \
-		-w /go/src/github.com/GoogleContainerTools/kpt \
+		-v `pwd`:/go/src/github.com/kptdev/kpt \
+		-w /go/src/github.com/kptdev/kpt \
 		$(GORELEASER_IMAGE) \
 		-f "$(GORELEASER_CONFIG)" release \
 		--skip=validate

README.md

@@ -52,28 +52,22 @@ The kpt toolchain includes the following components:
   off-the-shelf, tested functions. kpt makes configuration easy to create and transform, via reusable functions. Because
   they are expected to be used for in-place transformation, the functions need to be idempotent.
 
-- [**Backstage UI plugin**](https://github.com/kptdev/kpt-backstage-plugins): We've created a proof-of-concept UI in the
-  form of a [Backstage UI plugin](https://github.com/kptdev/kpt-backstage-plugins) to demonstrate the WYSIWYG
-  experience that's possible on top of the package orchestrator. More scenarios can be supported by implementing
-  form-based editors for additional Kubernetes resource types.
-
-- [**Package orchestrator (Porch)**](https://docs.nephio.org/docs/porch/): 
+- **Package orchestrator**: 
   The [package orchestrator](https://github.com/kptdev/kpt/blob/main/docs/design-docs/07-package-orchestration.md)
-  enables the magic behind the unique WYSIWYG experience. It provides a control plane for creating, modifying, updating,
-  and deleting packages, and evaluating functions on package data. This enables operations on packaged resources similar
-  to operations directly on the live state through the Kubernetes API. Porch is deceloped in the
-  [Nephio](https://docs.nephio.org/) community.
-
-- **Config Sync**: While the package orchestrator can be used with any GitOps tool,
-  [Config Sync](https://github.com/GoogleContainerTools/kpt-config-sync) provides a reference GitOps implementation to
-  complete the WYSIWYG management experience and enable end-to-end development of new features, such as 
-  [OCI-based packages](https://github.com/GoogleContainerTools/kpt/issues/2300). Config Sync is also helping to drive
-  improvements in upstream Kubernetes. For instance, Config Sync is built on top of
-  [git-sync](https://github.com/kubernetes/git-sync) and leverages [Kustomize](https://kustomize.io) to automatically
-  render manifests on the fly when needed. It uses the same apply logic as the kpt CLI.
-  [Config Sync](https://github.com/GoogleContainerTools/kpt-config-sync) is not maintained by the kpt community as we
-  are looking for integrations to other GitOps tools.
-
+  enables the magic behind the unique WYSIWYG experience. It provides a control plane for creating,
+  modifying, updating, and deleting packages, and evaluating functions on package data. This enables operations on packaged resources
+  similar to operations directly on the live state through the Kubernetes API.
+
+- **Config Sync**: While the package orchestrator
+  can be used with any GitOps tool, [Config Sync](https://github.com/kptdev/kpt-config-sync) provides a reference GitOps implementation to complete the WYSIWYG management
+  experience and enable end-to-end development of new features, such as 
+  [OCI-based packages](https://github.com/kptdev/kpt/issues/2300). Config Sync is also helping to drive improvements
+  in upstream Kubernetes. For instance, Config Sync is built on top of [git-sync](https://github.com/kubernetes/git-sync) and
+  leverages [Kustomize](https://kustomize.io) to automatically render manifests on the fly when needed. It uses the same apply
+  logic as the kpt CLI.
+
+- **Backstage UI plugin**: We've created a proof-of-concept UI in the form of a [Backstage UI plugin](https://github.com/kptdev/kpt-backstage-plugins) to demonstrate the WYSIWYG experience that's possible on top of the
+  package orchestrator. More scenarios can be supported by implementing form-based editors for additional Kubernetes resource types.
 
 ## Roadmap
 

commands/alpha/alphacmd.go

@@ -17,13 +17,15 @@ package alpha
 import (
 	"context"
 
-	"github.com/GoogleContainerTools/kpt/commands/alpha/license"
-	"github.com/GoogleContainerTools/kpt/commands/alpha/live"
-	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts"
-	"github.com/GoogleContainerTools/kpt/commands/alpha/wasm"
+	"github.com/kptdev/kpt/commands/alpha/license"
+	"github.com/kptdev/kpt/commands/alpha/live"
 
-	"github.com/GoogleContainerTools/kpt/internal/docs/generated/alphadocs"
-	"github.com/GoogleContainerTools/kpt/internal/util/porch"
+	// TODO: Revert once new module exists
+	// "github.com/kptdev/kpt/commands/alpha/rollouts"
+	"github.com/kptdev/kpt/commands/alpha/wasm"
+
+	"github.com/kptdev/kpt/internal/docs/generated/alphadocs"
+	"github.com/kptdev/kpt/internal/util/porch"
 	"github.com/spf13/cobra"
 )
 
@@ -49,7 +51,8 @@ func GetCommand(ctx context.Context, _, version string) *cobra.Command {
 		wasm.NewCommand(ctx, version),
 		live.GetCommand(ctx, "", version),
 		license.NewCommand(ctx, version),
-		rollouts.NewCommand(ctx, version),
+		// TODO: Revert once new module exists
+		// rollouts.NewCommand(ctx, version),
 	)
 
 	return alpha

commands/alpha/license/command.go

@@ -17,8 +17,8 @@ package license
 import (
 	"context"
 
-	"github.com/GoogleContainerTools/kpt/commands/alpha/license/info"
-	"github.com/GoogleContainerTools/kpt/internal/docs/generated/licensedocs"
+	"github.com/kptdev/kpt/commands/alpha/license/info"
+	"github.com/kptdev/kpt/internal/docs/generated/licensedocs"
 	"github.com/spf13/cobra"
 )