fix upstream conflicts

kubeflow · Apr 8, 2024 · de05450 · de05450
2 parents 460068b + ac39931
commit de05450
Show file tree

Hide file tree

Showing 216 changed files with 13,127 additions and 15,887 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Have questions or need support?
+    url: https://github.com/kubeflow/pipelines/discussions
+    about: Please ask questions on the Discussions tab
diff --git a/backend/api/v1beta1/auth.proto b/backend/api/v1beta1/auth.proto
@@ -22,6 +22,7 @@ import "google/protobuf/empty.proto";
 import "protoc-gen-swagger/options/annotations.proto";
 
 option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
+  schemes: [1, 2], // http + https
   responses: {
     key: "default";
     value: {

diff --git a/backend/api/v1beta1/experiment.proto b/backend/api/v1beta1/experiment.proto
@@ -25,6 +25,7 @@ import "google/protobuf/timestamp.proto";
 import "protoc-gen-swagger/options/annotations.proto";
 
 option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
+  schemes: [1, 2], // http + https
   responses: {
     key: "default";
     value: {

diff --git a/backend/api/v1beta1/go_client/auth.pb.go b/backend/api/v1beta1/go_client/auth.pb.go
diff --git a/backend/api/v1beta1/go_client/experiment.pb.go b/backend/api/v1beta1/go_client/experiment.pb.go
diff --git a/backend/api/v1beta1/go_client/healthz.pb.go b/backend/api/v1beta1/go_client/healthz.pb.go
diff --git a/backend/api/v1beta1/go_client/job.pb.go b/backend/api/v1beta1/go_client/job.pb.go
diff --git a/backend/api/v1beta1/go_client/pipeline.pb.go b/backend/api/v1beta1/go_client/pipeline.pb.go
diff --git a/backend/api/v1beta1/go_client/run.pb.go b/backend/api/v1beta1/go_client/run.pb.go
diff --git a/backend/api/v1beta1/go_client/visualization.pb.go b/backend/api/v1beta1/go_client/visualization.pb.go
diff --git a/backend/api/v1beta1/go_http_client/experiment_client/experiment_client.go b/backend/api/v1beta1/go_http_client/experiment_client/experiment_client.go