Merge remote-tracking branch 'origin/main' into e2e-test-2

.github/workflows/porch-e2e.yaml

@@ -18,14 +18,12 @@ on:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
   pull_request:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
 jobs:
@@ -48,12 +46,14 @@ jobs:
         uses: jaxxstorm/[email protected]
         with:
           repo: kptdev/kpt
-          tag: v1.0.0-beta.49
+          tag: v1.0.0-beta.54
           chmod: 0755
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1
         with:
           cluster_name: kind
+          version: v0.23.0
+          kubectl_version: v1.30.0
       - name: Build Images and Deploy porch kpt pkg
         run: IMAGE_REPO=porch-kind IMAGE_TAG=${GITHUB_SHA:0:8} KIND_CONTEXT_NAME=kind make run-in-kind
       - name: Sleep for 30 seconds

.github/workflows/porchctl-cli-e2e.yaml

@@ -18,14 +18,12 @@ on:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
   pull_request:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
 jobs:
@@ -46,14 +44,18 @@ jobs:
         uses: jaxxstorm/[email protected]
         with:
           repo: kptdev/kpt
-          tag: v1.0.0-beta.49
+          tag: v1.0.0-beta.54
           chmod: 0755
       - name: Build and install porchctl
-        run: make porchctl
+        run: |
+          make porchctl
+          .build/porchctl version
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1
         with:
           cluster_name: kind
+          version: v0.23.0
+          kubectl_version: v1.30.0
       - name: Build Images and Deploy porch kpt pkg
         run: IMAGE_REPO=porch-kind IMAGE_TAG=${GITHUB_SHA:0:8} KIND_CONTEXT_NAME=kind make run-in-kind
       - name: porchctl e2e test

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

@@ -13,8 +13,12 @@
 # limitations under the License.
 
 name: porchctl dev release
+
+# build and update the porchctl on merge to main branch
 on:
   push:
+    branches:
+      - main
 
 jobs:
   build:

.vscode/launch.json

@@ -20,7 +20,8 @@
             "cwd": "${workspaceFolder}",
             "env": { 
                 "CERT_STORAGE_DIR": "${workspaceFolder}/.build/pki/tmp", 
-                "WEBHOOK_HOST": "localhost"
+                "WEBHOOK_HOST": "localhost",
+                "GOOGLE_API_GO_EXPERIMENTAL_DISABLE_NEW_AUTH_LIB": "true"
             }
         },
         {

Makefile

@@ -18,6 +18,7 @@ CACHEDIR=$(CURDIR)/.cache
 export DEPLOYPORCHCONFIGDIR ?= $(BUILDDIR)/deploy
 DEPLOYKPTCONFIGDIR=$(BUILDDIR)/kpt_pkgs
 PORCHDIR=$(abspath $(CURDIR))
+PORCHCTL_VERSION := $(shell date '+development-%Y-%m-%dT%H:%M:%S')
 
 # This includes the following targets:
 #   test, unit, unit-clean,
@@ -66,13 +67,6 @@ else
   endif
 endif
 
-# Modules are ordered in dependency order. A module precedes modules that depend on it.
-MODULES = \
- examples/apps/hello-server \
- api \
- . \
- controllers \
-
 .DEFAULT_GOAL := all
 
 .PHONY: all
@@ -139,17 +133,30 @@ start-function-runner:
 	  $(IMAGE_REPO)/$(PORCH_FUNCTION_RUNNER_IMAGE):$(IMAGE_TAG) \
 	  -disable-runtimes pod
 
+
+ # API Modules
+API_MODULES = \
+ api \
+ pkg/kpt/api \
+ controllers \
+
 .PHONY: generate-api
 generate-api:
 	KUBE_VERBOSE=2 $(CURDIR)/scripts/generate-api.sh
 
 .PHONY: generate
 generate: generate-api ## Generate CRDs, other K8s manifests and helper go code
-	@for f in $(MODULES); do (cd $$f; echo "Generating $$f"; go generate -v ./...) || exit 1; done
+	@for f in $(API_MODULES); do (cd $$f; echo "Generating for $$f ..."; go generate -v ./...) || exit 1; done
 
+# Go Modules are ordered in dependency order. A module precedes modules that depend on it.
+GO_MODULES = \
+ api \
+ . \
+ controllers \
+
 .PHONY: tidy
 tidy:
-	@for f in $(MODULES); do (cd $$f; echo "Tidying $$f"; go mod tidy) || exit 1; done
+	@for f in $(GO_MODULES); do (cd $$f; echo "Tidying $$f"; go mod tidy) || exit 1; done
 
 .PHONY: configure-git
 configure-git:
@@ -186,7 +193,7 @@ porch:
 
 .PHONY: porchctl
 porchctl:
-	go build -o $(PORCHCTL) ./cmd/porchctl
+	go build -ldflags="-X github.com/nephio-project/porch/cmd/porchctl/run.version=$(PORCHCTL_VERSION)" -o $(PORCHCTL) ./cmd/porchctl
 
 .PHONY: fix-headers
 fix-headers: