Skip to content

Commit ec2b277

Browse files
authored
Convert Porch to use the github.com/kptdev version of kpt (kptdev#343)
* Update code generation Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated for unit tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Unit tests passing locally Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix docker build and version setting on API server Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix missed image address Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated some missed image links and Dockerfiles Signed-off-by: liamfallon <liam.fallon@est.tech> * Address review comments Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix linting issues Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated following review comments Signed-off-by: liamfallon <liam.fallon@est.tech> * Suppress linting on Endpoin deprecation Signed-off-by: liamfallon <liam.fallon@est.tech> * Update gitea to see if it addresses gitea issue on build for e2e tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix Dockerfile for porhc server Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix failing e2e test Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix e2e tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix e2e tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix e2e tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Fixed code generation locations and headers Signed-off-by: liamfallon <liam.fallon@est.tech> * Update Makefile that was corrupted in rebase Signed-off-by: liamfallon <liam.fallon@est.tech> --------- Signed-off-by: liamfallon <liam.fallon@est.tech>
1 parent 827f8ee commit ec2b277

1,421 files changed

Lines changed: 53680 additions & 17446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#PORCH_GCP_HIERARCHY_REF=<branch_name>
2020
#PORCH_KPT_FUNCTION_REF=<branch_name>
2121

22-
# GCR prefix should not contain trailing "/": TestPodFunctionEvaluatorWithDistrolessImage uses kpt-fn-demo directory.
23-
# If GRC prefix environment variable is set, make run-in-kind should be run after for changes to take effect.
24-
# Format: your-gcr-mirror/kpt-fn
25-
#PORCH_GCR_PREFIX_URL=<your_gcr_registry_mirror_url>
22+
# GHCR prefix should not contain trailing "/": TestPodFunctionEvaluatorWithDistrolessImage uses kpt-fn-demo directory.
23+
# If GHCR prefix environment variable is set, make run-in-kind should be run after for changes to take effect.
24+
# Format: your-mirror/kpt-fn
25+
#PORCH_GHCR_PREFIX_URL=<your_registry_mirror_url>

.github/workflows/porch-e2e-dbcache.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
uses: jaxxstorm/action-install-gh-release@v2.1.0
4545
with:
4646
repo: kptdev/kpt
47-
tag: v1.0.0-beta.58
47+
tag: v1.0.0-beta.59
4848
chmod: 0755
4949
- name: Install Kind
5050
uses: helm/kind-action@v1
5151
with:
52-
version: v0.29.0
52+
version: v0.30.0
5353
install_only: true
5454
- name: Set up Git config
5555
run: |

.github/workflows/porch-e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
uses: jaxxstorm/action-install-gh-release@v2.1.0
4545
with:
4646
repo: kptdev/kpt
47-
tag: v1.0.0-beta.58
47+
tag: v1.0.0-beta.59
4848
chmod: 0755
4949
- name: Install Kind
5050
uses: helm/kind-action@v1
5151
with:
52-
version: v0.29.0
52+
version: v0.30.0
5353
install_only: true
5454
- name: Set up Git config
5555
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
uses: jaxxstorm/action-install-gh-release@v2.1.0
4545
with:
4646
repo: kptdev/kpt
47-
tag: v1.0.0-beta.58
47+
tag: v1.0.0-beta.59
4848
chmod: 0755
4949
- name: Install Kind
5050
uses: helm/kind-action@v1
5151
with:
52-
version: v0.24.0
52+
version: v0.30.0
5353
install_only: true
5454
- name: Set up Git config
5555
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
uses: jaxxstorm/action-install-gh-release@v2.1.0
4545
with:
4646
repo: kptdev/kpt
47-
tag: v1.0.0-beta.58
47+
tag: v1.0.0-beta.59
4848
chmod: 0755
4949
- name: Install Kind
5050
uses: helm/kind-action@v1
5151
with:
52-
version: v0.24.0
52+
version: v0.30.0
5353
install_only: true
5454
- name: Set up Git config
5555
run: |

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
go-version-file: go.mod
4040

4141
- name: Download kpt CLI
42-
run: mkdir -p bin && wget -O bin/kpt https://github.com/kptdev/kpt/releases/download/v1.0.0-beta.55/kpt_linux_amd64 && chmod +x bin/kpt
42+
run: mkdir -p bin && wget -O bin/kpt https://github.com/kptdev/kpt/releases/download/v1.0.0-beta.59/kpt_linux_amd64 && chmod +x bin/kpt
4343

4444
- name: Build porch blueprint
4545
run: PATH=./bin:$PATH IMAGE_REPO=docker.io/nephio IMAGE_TAG=${{ github.ref_name }} make deployment-config

api/generated/clientset/versioned/clientset.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/generated/clientset/versioned/fake/clientset_generated.go

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/generated/clientset/versioned/typed/porch/v1alpha1/fake/fake_packagerevision.go

Lines changed: 28 additions & 112 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)