Skip to content

Commit 64e8264

Browse files
authored
chore: fix kfp-kubernetes pipeline spec resolution errors (kubeflow#11868)
* use packaged pipeline spec in k8s platform pkg kfp-kubernetes expects pipeline spec to be present in global namespace this change updates generate proto code to replace this import to correctly reference the spec in the kfp.pipeline_spec namespace. Signed-off-by: Humair Khan <[email protected]> * update to protoc 3.20 upgrading to 3.20 resolves issues where some of the proto python generated code attempts to directly create descriptors. This issue is encountered when trying to use kfp-kubernetes packages with kfp sdk, forcing the user to downgrade protobuf to 3.20 or lower despite the kfp sdk and kfp-kubernetes supporting >=4.0. This change resolves this issue. updating protoc also requires regeneration of all go and python proto code, as well us updates to the api generate and release images. Signed-off-by: Humair Khan <[email protected]> --------- Signed-off-by: Humair Khan <[email protected]>
1 parent 0359551 commit 64e8264

File tree

79 files changed

+236
-119
lines changed

Some content is hidden

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

79 files changed

+236
-119
lines changed

api/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Contact one of chensun, HumairAK, zijianjoy if this remote image needs an update.
16-
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.0
16+
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.1
1717

1818
.PHONY: all
1919
all: golang python

api/v2alpha1/go/cachekey/cache_key.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2alpha1/go/pipelinespec/pipeline_spec.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV GRPC_GATEWAY_VERSION v1.9.6
1818
ENV GO_SWAGGER_VERSION v0.18.0
1919
ENV GOLANG_PROTOBUF_VERSION v1.5.1
2020
ENV GRPC_VERSION v1.23.0
21-
ENV PROTOC_VERSION 3.17.3
21+
ENV PROTOC_VERSION 3.20.3
2222
ENV GOBIN=/go/bin
2323

2424
# Install protoc.

backend/api/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator
2121
API_VERSION ?= v2beta1
2222

2323
# Keep in sync with the version used in test/release/Dockerfile.release
24-
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.0
24+
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.1
2525

2626
CONTAINER_ENGINE ?= docker
2727

backend/api/v1beta1/go_client/auth.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/v1beta1/go_client/error.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/v1beta1/go_client/experiment.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/v1beta1/go_client/filter.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/v1beta1/go_client/healthz.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)