Remove kpt alpha cli calls

content/en/docs/porch/running-porch/running-on-GKE.md

@@ -24,15 +24,15 @@ need:
 * A [GCP Project](https://console.cloud.google.com/projectcreate)
 * [gcloud](https://cloud.google.com/sdk/docs/install)
 * [kubectl](https://kubernetes.io/docs/tasks/tools/); you can install it via `gcloud components install kubectl`
-* [kpt](https://kpt.dev/)
+* [porchctl](https://github.com/nephio-project/porch/releases/download/main/porchctl.tgz)
 * Command line utilities such as *curl*, *tar*
 
 To build and run Porch on GKE, you will also need:
 
 * A container registry which will work with your GKE cluster.
   [Artifact Registry](https://console.cloud.google.com/artifacts) or
   [Container Registry](https://console.cloud.google.com/gcr) work well though you can use others too.
-* [go 1.17](https://go.dev/dl/) or newer
+* [go 1.21](https://go.dev/dl/) or newer
 * [docker](https://docs.docker.com/get-docker/)
 * [Configured docker credential helper](https://cloud.google.com/sdk/gcloud/reference/auth/configure-docker)
 * [git](https://git-scm.com/)
@@ -75,14 +75,14 @@ gcloud container clusters get-credentials --region us-central1 porch-dev
 To run a released version of Porch, download the release config bundle from
 [Porch release page](https://github.com/nephio-project/porch/releases).
 
-Untar and apply the *deployment-blueprint.tar.gz* config bundle. This will install:
+Untar and apply the *porch_blueprint.tar.gz* config bundle. This will install:
 
 * Porch server
 * [Config Sync](https://kpt.dev/gitops/configsync/)
 
 ```bash
 mkdir porch-install
-tar xzf ~/Downloads/deployment-blueprint.tar.gz -C porch-install
+tar xzf ~/Downloads/porch_blueprint.tar.gz -C porch-install
 kubectl apply -f porch-install
 kubectl wait deployment --for=condition=Available porch-server -n porch-system
 ```
@@ -136,7 +136,7 @@ IMAGE_TAG=$(git rev-parse --short HEAD) make push-and-deploy-no-sa
 ```
 
 If you want to use a different repository, you can set IMAGE_REPO variable
-(see [Makefile](https://github.com/nephio-project/porch/blob/main/Makefile#L32) for details).
+(see [Makefile](https://github.com/nephio-project/porch/blob/main/Makefile#L33) for details).
 
 The `make push-and-deploy-no-sa` target will install Porch but not Config Sync. You can install Config Sync in your k8s
 cluster manually following the
@@ -190,11 +190,7 @@ kubectl annotate serviceaccount porch-server -n porch-system \
   iam.gke.io/gcp-service-account=porch-server@${GCP_PROJECT_ID}.iam.gserviceaccount.com
 ```
 
-<<<<<<< HEAD
 Build Porch, push images, and deploy Porch server and controllers using the `make` target that adds workload identity
-=======
-Build Porch, push images, and deploy porch server and controllers using the make target that adds workload identity
->>>>>>> main
 service account annotations:
 
 ```bash
@@ -210,7 +206,7 @@ kubectl api-resources | grep porch
 To register a repository, use the following command:
 
 ```bash
-kpt alpha repo register --repo-workload-identity --namespace=default https://source.developers.google.com/p/<project>/r/<repo>
+porchctl repo register --repo-workload-identity --namespace=default https://source.developers.google.com/p/<project>/r/<repo>
 ```
 
 #### OCI
@@ -248,20 +244,3 @@ gcloud iam service-accounts add-iam-policy-binding porch-sync@${GCP_PROJECT_ID}.
   --role roles/iam.workloadIdentityUser \
   --member "serviceAccount:${GCP_PROJECT_ID}.svc.id.goog[porch-system/porch-controllers]"
 ```
-
-<<<<<<< HEAD
-Build Porch, push images, and deploy Porch server and controllers using the `make` target that adds workload identity
-=======
-Build Porch, push images, and deploy porch server and controllers using the make target that adds workload identity
->>>>>>> main
-service account annotations:
-
-```bash
-IMAGE_TAG=$(git rev-parse --short HEAD) make push-and-deploy
-```
-
-As above, you can verify that Porch is running by querying the api-resources:
-
-```bash
-kubectl api-resources | grep porch
-```

content/en/docs/porch/using-porch/install-and-using-porch.md

@@ -7,7 +7,7 @@ description: "A tutorial to install and use Porch"
 
 This tutorial is a guide to installing and using Porch. It is based on the
 [Porch demo produced by Tal Liron of Google](https://github.com/tliron/klab/tree/main/environments/porch-demo). Users
-should be very comfortable with using *git*, *docker*, and *kubernetes*.
+should be comfortable using *git*, *docker*, and *kubernetes*.
 
 See also [the Nephio Learning Resource](https://github.com/nephio-project/docs/blob/main/learning.md) page for
 background help and information.
@@ -1954,7 +1954,7 @@ In these packages, you will see that:
    network-function-auto-namespace-y-cumulonimbus respectively in the *pckage-context.yaml* files
 
 This has all been performed automatically; we have not had to perform the
-`porchctl rpkg pull/kpt fn render/porchctl rpkg push` combination of commands to make these chages as we had to in the
+`porchctl rpkg pull/kpt fn render/porchctl rpkg push` combination of commands to make these changes as we had to in the
 *simple-variant.yaml* case above.
 
 Now, let us explore the packages further: