From 1a3d39ccda955a31e98fcc3149e1c7a9f424dfbf Mon Sep 17 00:00:00 2001 From: blublinsky Date: Thu, 26 Oct 2023 18:35:33 +0100 Subject: [PATCH 1/2] updating url use v1 --- apiserver/HACluster.md | 5 +- apiserver/README.md | 101 ++++++++------- apiserver/Volumes.md | 120 ++++++++---------- apiserver/test/cluster/cluster/cluster | 2 +- apiserver/test/cluster/template/simple | 10 +- apiserver/test/job/job | 2 +- proto/cluster.proto | 10 +- proto/config.proto | 18 +-- proto/go_client/cluster.pb.go | 86 +++++++------ proto/go_client/cluster.pb.gw.go | 30 ++--- proto/go_client/config.pb.go | 163 ++++++++++++------------- proto/go_client/config.pb.gw.go | 54 ++++---- proto/go_client/job.pb.go | 80 ++++++------ proto/go_client/job.pb.gw.go | 30 ++--- proto/go_client/serve.pb.go | 125 +++++++++---------- proto/go_client/serve.pb.gw.go | 42 +++---- proto/job.proto | 10 +- proto/kuberay_api.swagger.json | 32 ++--- proto/serve.proto | 14 +-- proto/swagger/cluster.swagger.json | 6 +- proto/swagger/config.swagger.json | 12 +- proto/swagger/job.swagger.json | 6 +- proto/swagger/serve.swagger.json | 8 +- 23 files changed, 469 insertions(+), 497 deletions(-) diff --git a/apiserver/HACluster.md b/apiserver/HACluster.md index 48942310ce..b81d5a13fa 100644 --- a/apiserver/HACluster.md +++ b/apiserver/HACluster.md @@ -52,7 +52,7 @@ kubectl apply -f /kuberay/apiserver/test/cluster/code_configmap.y To create a Ray cluster we can use the following curl command: ```sh -curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/clusters' \ +curl -X POST 'localhost:8888/apis/v1/namespaces/default/clusters' \ --header 'Content-Type: application/json' \ --data '{ "name": "ha-cluster", @@ -151,8 +151,7 @@ password. "num-cpu": "0" ``` -Where the value of `REDIS_PASSWORD` comes from environment variable (below). Additionally `num-cpus: 0` ensures -that that no application code runs on a head node. +Where the value of `REDIS_PASSWORD` comes from environment variable (below). Additionally `num-cpus: 0` ensures that no application code runs on a head node. The following environment variable have to be added here: diff --git a/apiserver/README.md b/apiserver/README.md index 1ae1f16bcd..7f91b8f459 100644 --- a/apiserver/README.md +++ b/apiserver/README.md @@ -195,7 +195,7 @@ The following steps allow you to validate that the KubeRay API Server components ```sh # Create a template - curl --silent -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/compute_templates' \ + curl --silent -X POST 'localhost:31888/apis/v1/namespaces/ray-system/compute_templates' \ --header 'Content-Type: application/json' \ --data '{ "name": "default-template", @@ -205,7 +205,7 @@ The following steps allow you to validate that the KubeRay API Server components }' # Create the "Fruit Stand" Ray Serve example (V1 Config spec) - curl --silent -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \ + curl --silent -X POST 'localhost:31888/apis/v1/namespaces/ray-system/services' \ --header 'Content-Type: application/json' \ --data '{ "name": "test-v1", @@ -286,7 +286,7 @@ The following steps allow you to validate that the KubeRay API Server components # Delete the RayService in the namespace curl --silent -X 'DELETE' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/services/test-v1' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/services/test-v1' \ -H 'accept: application/json' ``` @@ -309,16 +309,16 @@ The full definition of the compute template resource can be found in [config.pro #### Create compute templates in a given namespace ```text -POST {{baseUrl}}/apis/v1alpha2/namespaces//compute_templates +POST {{baseUrl}}/apis/v1/namespaces//compute_templates ``` -Examples: +Examples (please make sure that `ray-system` namespace exists before running this command): * Request ```sh curl --silent -X 'POST' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/compute_templates' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/compute_templates' \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ @@ -343,7 +343,7 @@ Examples: #### List all compute templates in a given namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//compute_templates +GET {{baseUrl}}/apis/v1/namespaces//compute_templates ``` Examples: @@ -352,7 +352,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/compute_templates' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/compute_templates' \ -H 'accept: application/json' ``` @@ -374,7 +374,7 @@ Examples: #### List all compute templates in all namespaces ```text -GET {{baseUrl}}/apis/v1alpha2/compute_templates +GET {{baseUrl}}/apis/v1/compute_templates ``` Examples: @@ -383,7 +383,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/compute_templates' \ + 'http://localhost:31888/apis/v1/compute_templates' \ -H 'accept: application/json' ``` @@ -405,7 +405,7 @@ Examples: #### Get compute template by name ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//compute_templates/ +GET {{baseUrl}}/apis/v1/namespaces//compute_templates/ ``` Examples: @@ -414,7 +414,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/compute_templates/default-template' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/compute_templates/default-template' \ -H 'accept: application/json' ``` @@ -432,7 +432,7 @@ Examples: #### Delete compute template by name ```text -DELETE {{baseUrl}}/apis/v1alpha2/namespaces//compute_templates/ +DELETE {{baseUrl}}/apis/v1/namespaces//compute_templates/ ``` Examples: @@ -441,7 +441,7 @@ Examples: ```sh curl --silent -X 'DELETE' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/compute_templates/default-template' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/compute_templates/default-template' \ -H 'accept: application/json' ``` @@ -456,16 +456,16 @@ Examples: #### Create cluster in a given namespace ```text -POST {{baseUrl}}/apis/v1alpha2/namespaces//clusters +POST {{baseUrl}}/apis/v1/namespaces//clusters ``` -Examples: +Examples: (please make sure that template `default-template` is created before running this request) * Request ```sh curl --silent -X 'POST' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/clusters' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/clusters' \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ @@ -579,7 +579,7 @@ Examples: #### List all clusters in a given namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//clusters +GET {{baseUrl}}/apis/v1/namespaces//clusters ``` Examples: @@ -588,7 +588,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/clusters' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/clusters' \ -H 'accept: application/json' ``` @@ -713,7 +713,7 @@ Examples: #### List all clusters in all namespaces ```text -GET {{baseUrl}}/apis/v1alpha2/clusters +GET {{baseUrl}}/apis/v1/clusters ``` Examples: @@ -722,7 +722,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/clusters' \ + 'http://localhost:31888/apis/v1/clusters' \ -H 'accept: application/json' ``` @@ -847,7 +847,7 @@ Examples: #### Get cluster by its name and namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//clusters/ +GET {{baseUrl}}/apis/v1/namespaces//clusters/ ``` Examples: @@ -856,7 +856,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/clusters' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/clusters' \ -H 'accept: application/json' ``` @@ -981,7 +981,7 @@ Examples: #### Delete cluster by its name and namespace ```text -DELETE {{baseUrl}}/apis/v1alpha2/namespaces//clusters/ +DELETE {{baseUrl}}/apis/v1/namespaces//clusters/ ``` Examples: @@ -990,7 +990,7 @@ Examples: ```sh curl --silent -X 'DELETE' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/clusters/test-cluster' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/clusters/test-cluster' \ -H 'accept: application/json' ``` @@ -1005,7 +1005,7 @@ Examples: #### Create ray job in a given namespace ```text -POST {{baseUrl}}/apis/v1alpha2/namespaces//jobs +POST {{baseUrl}}/apis/v1/namespaces//jobs ``` Examples: @@ -1014,7 +1014,7 @@ Examples: ```sh curl --silent -X 'POST' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/jobs' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/jobs' \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ @@ -1045,8 +1045,7 @@ Examples: } ] } - } - ' + }' ``` * Response @@ -1093,7 +1092,7 @@ Start from creating Ray cluster (We assume here that the [template](test/cluster * Request ```sh -curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/default/clusters' \ +curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \ --header 'Content-Type: application/json' \ --data '{ "name": "job-test", @@ -1218,7 +1217,7 @@ Once the cluster is created, we can create a job to run on it. * Request ```sh -curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/default/jobs' \ +curl -X POST 'localhost:31888/apis/v1/namespaces/default/jobs' \ --header 'Content-Type: application/json' \ --data '{ "name": "job-test", @@ -1299,7 +1298,7 @@ kubectl delete rayjob job-test * Request ```sh -curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/default/jobs' \ +curl -X POST 'localhost:31888/apis/v1/namespaces/default/jobs' \ --header 'Content-Type: application/json' \ --data '{ "name": "job-test", @@ -1340,7 +1339,7 @@ You should beble to see job execution results similar to above #### List all jobs in a given namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//jobs +GET {{baseUrl}}/apis/v1/namespaces//jobs ``` Examples: @@ -1349,7 +1348,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/jobs' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/jobs' \ -H 'accept: application/json' ``` @@ -1399,7 +1398,7 @@ Examples: #### List all jobs in all namespaces ```text -GET {{baseUrl}}/apis/v1alpha2/jobs +GET {{baseUrl}}/apis/v1/jobs ``` Examples: @@ -1408,7 +1407,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/jobs' \ + 'http://localhost:31888/apis/v1/jobs' \ -H 'accept: application/json' ``` @@ -1458,7 +1457,7 @@ Examples: #### Get job by its name and namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//jobs/ +GET {{baseUrl}}/apis/v1/namespaces//jobs/ ``` Examples: @@ -1467,7 +1466,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/jobs/rayjob-test' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/jobs/rayjob-test' \ -H 'accept: application/json' ``` @@ -1513,7 +1512,7 @@ Examples: #### Delete job by its name and namespace ```text -DELETE {{baseUrl}}/apis/v1alpha2/namespaces//jobs/ +DELETE {{baseUrl}}/apis/v1/namespaces//jobs/ ``` Examples: @@ -1522,7 +1521,7 @@ Examples: ```sh curl --silent -X 'DELETE' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/jobs/rayjob-test' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/jobs/rayjob-test' \ -H 'accept: application/json' ``` @@ -1537,7 +1536,7 @@ Examples: #### Create ray service in a given namespace ```text -POST {{baseUrl}}/apis/v1alpha2/namespaces//services +POST {{baseUrl}}/apis/v1/namespaces//services ``` Examples: @@ -1546,7 +1545,7 @@ Examples: ```sh curl --silent -X 'POST' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/services' \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ @@ -1700,7 +1699,7 @@ Examples: ```sh curl --silent -X 'POST' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/services' \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d ' @@ -1782,7 +1781,7 @@ Examples: #### List all services in a given namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//services +GET {{baseUrl}}/apis/v1/namespaces//services ``` Examples @@ -1791,7 +1790,7 @@ Examples ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/services' \ -H 'accept: application/json' ``` @@ -1901,7 +1900,7 @@ Examples #### List all services in all namespaces ```text -GET {{baseUrl}}/apis/v1alpha2/services +GET {{baseUrl}}/apis/v1/services ``` Examples: @@ -1910,7 +1909,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/services' \ + 'http://localhost:31888/apis/v1/services' \ -H 'accept: application/json' ``` @@ -2020,7 +2019,7 @@ Examples: #### Get service by its name and namespace ```text -GET {{baseUrl}}/apis/v1alpha2/namespaces//services/ +GET {{baseUrl}}/apis/v1/namespaces//services/ ``` Examples: @@ -2029,7 +2028,7 @@ Examples: ```sh curl --silent -X 'GET' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/services/test-v1' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/services/test-v1' \ -H 'accept: application/json' ``` @@ -2232,7 +2231,7 @@ Examples: #### Delete service by its name and namespace ```text -DELETE {{baseUrl}}/apis/v1alpha2/namespaces//services/ +DELETE {{baseUrl}}/apis/v1/namespaces//services/ ``` Examples: @@ -2241,7 +2240,7 @@ Examples: ```sh curl --silent -X 'DELETE' \ - 'http://localhost:31888/apis/v1alpha2/namespaces/ray-system/services/test-v1' \ + 'http://localhost:31888/apis/v1/namespaces/ray-system/services/test-v1' \ -H 'accept: application/json' ``` diff --git a/apiserver/Volumes.md b/apiserver/Volumes.md index e4ed867e16..133f56bdd9 100644 --- a/apiserver/Volumes.md +++ b/apiserver/Volumes.md @@ -1,102 +1,91 @@ # Volumes support for Ray cluster by the API server API server allows to specify multiple types of volumes mounted to the Ray pods (nodes). These include: -[hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath), -[PVC](https://kubernetes.io/docs/concepts/storage/persistent-volumes/), -[ephemeral](https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/), -[config maps](https://kubernetes.io/docs/concepts/storage/volumes/#configmap), -[secrets](https://kubernetes.io/docs/concepts/storage/volumes/#secret), -and [empty dir](https://kubernetes.io/docs/concepts/storage/volumes/#emptydir). -Multiple volumes of different type can be mounted to both head and worker nodes, by defining a volume array for them +* [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) +* [PVC](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) +* [ephemeral](https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/) +* [config maps](https://kubernetes.io/docs/concepts/storage/volumes/#configmap) +* [secrets](https://kubernetes.io/docs/concepts/storage/volumes/#secret) +* [empty dir](https://kubernetes.io/docs/concepts/storage/volumes/#emptydir) + +Multiple volumes of different type can be mounted to both head and worker nodes, by defining a array of volumes ## HostPath volumes -A hostPath volume mounts a file or directory from the host node's filesystem into your Pod. This is not something that -most Pods will need, but it offers a powerful escape hatch for some applications. +A hostPath volume mounts a file or directory from the host node's filesystem into your Pod. This is not something that most Pods will need, but it offers a powerful escape hatch for some applications. For example, some uses for a hostPath are: * running a container that needs access to Docker internals; use a hostPath of /var/lib/docker * running cAdvisor in a container; use a hostPath of /sys -* allowing a Pod to specify whether a given hostPath should exist prior to the Pod running, whether it should be -created, and what it should exist as +* allowing a Pod to specify whether a given hostPath should exist prior to the Pod running, whether it should be created, and what it should exist as The code below gives an example of hostPath volume definition: -```` +```shell { - "name": "hostPath", # unique name - "source": "/tmp", # data location on host - "mountPath": "/tmp/hostPath", # mounting path - "volumeType": 1, # volume type - host path - "hostPathType": 0, # host path type - directory - "mountPropagationMode": 1 # mount propagation - host to container + "name": "hostPath", # unique name + "source": "/tmp", # data location on host + "mountPath": "/tmp/hostPath", # mounting path + "volumeType": 1, # volume type - host path + "hostPathType": 0, # host path type - directory + "mountPropagationMode": 1 # mount propagation - host to container } -```` +``` ## PVC volumes -A Persistent Volume Claim (PVC) is a request for storage by a user. It is similar to a Pod. Pods consume node resources -and PVCs consume PV resources. Pods can request specific levels of resources (CPU and Memory). Claims can request -specific size and access modes (e.g., they can be mounted `ReadWriteOnce`, `ReadOnlyMany` or `ReadWriteMany`). +A Persistent Volume Claim (PVC) is a request for storage by a user. It is similar to a Pod. Pods consume node resources and PVCs consume PV resources. Pods can request specific levels of resources (CPU and Memory). Claims can request specific size and access modes (e.g., they can be mounted `ReadWriteOnce`, `ReadOnlyMany` or `ReadWriteMany`). The caveat of using PVC volumes is that the same PVC is mounted to all nodes. As a result only PVCs with access mode `ReadOnlyMany` can be used in this case. The code below gives an example of PVC volume definition: -```` +```shell { - "name": "pvc", # unique name - "mountPath": "/tmp/pvc", # mounting path - "volumeType": 0, # volume type - PVC - "mountPropagationMode": 2, # mount propagation mode - bidirectional - "readOnly": false # read only + "name": "pvc", # unique name + "mountPath": "/tmp/pvc", # mounting path + "volumeType": 0, # volume type - PVC + "source": "myclaim" # Claim name + "mountPropagationMode": 2, # mount propagation mode - bidirectional + "readOnly": false # read only } -```` +``` ## Ephemeral volumes -Some application need additional storage but don't care whether that data is stored persistently across restarts. For -example, caching services are often limited by memory size and can move infrequently used data into storage that is -slower than memory with little impact on overall performance. Ephemeral volumes are designed for these use cases. -Because volumes follow the Pod's lifetime and get created and deleted along with the Pod, Pods can be stopped and -restarted without being limited to where some persistent volume is available. +Some application need additional storage but don't care whether that data is stored persistently across restarts. For example, caching services are often limited by memory size and can move infrequently used data into storage that is slower than memory with little impact on overall performance. Ephemeral volumes are designed for these use cases. Because volumes follow the Pod's lifetime and get created and deleted along with the Pod, Pods can be stopped and restarted without being limited to where some persistent volume is available. -Although there are several option of ephemeral volumes, here we are using generic ephemeral volumes, which can be -provided by all storage drivers that also support persistent volumes. Generic ephemeral volumes are similar to emptyDir -volumes in the sense that they provide a per-pod directory for scratch data that is usually empty after provisioning. -But they may also have additional features: +Although there are several option of ephemeral volumes, here we are using generic ephemeral volumes, which can be provided by all storage drivers that also support persistent volumes. Generic ephemeral volumes are similar to emptyDir volumes in the sense that they provide a per-pod directory for scratch data that is usually empty after provisioning. But they may also have additional features: * Storage can be local or network-attached. * Volumes can have a fixed size that Pods are not able to exceed. The code below gives an example of ephemeral volume definition: -```` +```shell { - "name": "ephemeral", # unique name - "mountPath": "/tmp/ephemeral" # mounting path, - "mountPropagationMode": 0, # mount propagation mode - None - "volumeType": 2, # volume type - ephemeral - "storage": "5Gi", # disk size - "storageClass": "default" # storage class - optional - "accessMode": 0 # access mode RWO - optional + "name": "ephemeral", # unique name + "mountPath": "/tmp/ephemeral" # mounting path, + "mountPropagationMode": 0, # mount propagation mode - None + "volumeType": 2, # volume type - ephemeral + "storage": "5Gi", # disk size + "storageClass": "default" # storage class - optional + "accessMode": 0 # access mode RWO - optional } -```` +``` ## Config map volumes -A ConfigMap provides a way to inject configuration data into pods. The data stored in a ConfigMap can be referenced in -a volume of type configMap and then consumed by containerized applications running in a pod. +A ConfigMap provides a way to inject configuration data into pods. The data stored in a ConfigMap can be referenced in a volume of type configMap and then consumed by containerized applications running in a pod. -When referencing a ConfigMap, you provide the name of the ConfigMap in the volume. You can customize the path to use -for a specific entry in the ConfigMap. +When referencing a ConfigMap, you provide the name of the ConfigMap in the volume. You can customize the path to use for a specific entry in the ConfigMap. The code below gives an example of config map volume definition: -```` +```shell { "name":"code-sample", # Unique name "mountPath":"/home/ray/samples", # mounting path @@ -106,17 +95,15 @@ The code below gives an example of config map volume definition: "sample_code.py":"sample_code.py" } } -```` +``` ## Secret volumes -A secret volume is used to pass sensitive information, such as passwords, to Pods. You can store secrets in the -Kubernetes API and mount them as files for use by pods without coupling to Kubernetes directly. Secret volumes are -backed by tmpfs (a RAM-backed filesystem) so they are never written to non-volatile storage. +A secret volume is used to pass sensitive information, such as passwords, to Pods. You can store secrets in the Kubernetes API and mount them as files for use by pods without coupling to Kubernetes directly. Secret volumes are backed by tmpfs (a RAM-backed filesystem) so they are never written to non-volatile storage. The code below gives an example of secret volume definition: -```` +```shell { "name":"important-secret", # Unique name "mountPath":"/home/ray/sensitive", # mounting path @@ -126,22 +113,19 @@ The code below gives an example of secret volume definition: "subPath": "password" } } -```` +``` ## Emptydir volumes -An emptyDir volume is first created when a Pod is assigned to a node, and exists as long as that Pod is running on -that node. As the name says, the emptyDir volume is initially empty. All containers in the Pod can read and write the -same files in the emptyDir volume, though that volume can be mounted at the same or different paths in each container. -When a Pod is removed from a node for any reason, the data in the emptyDir is deleted permanently. +An emptyDir volume is first created when a Pod is assigned to a node, and exists as long as that Pod is running on that node. As the name says, the emptyDir volume is initially empty. All containers in the Pod can read and write the same files in the emptyDir volume, though that volume can be mounted at the same or different paths in each container. When a Pod is removed from a node for any reason, the data in the emptyDir is deleted permanently. The code below gives an example of empydir volume definition: -```` +```shell { - "name": "emptyDir", # unique name - "mountPath": "/tmp/emptydir" # mounting path, - "volumeType": 5, # vlume type - ephemeral - "storage": "5Gi", # max storage size - optional + "name": "emptyDir", # unique name + "mountPath": "/tmp/emptydir" # mounting path, + "volumeType": 5, # volume type - ephemeral + "storage": "5Gi", # max storage size - optional } -```` +``` diff --git a/apiserver/test/cluster/cluster/cluster b/apiserver/test/cluster/cluster/cluster index fe84d8cbd3..53310e7562 100644 --- a/apiserver/test/cluster/cluster/cluster +++ b/apiserver/test/cluster/cluster/cluster @@ -1,4 +1,4 @@ -curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/clusters' \ +curl -X POST 'localhost:8888/apis/v1/namespaces/default/clusters' \ --header 'Content-Type: application/json' \ --data '{ "name": "test-cluster", diff --git a/apiserver/test/cluster/template/simple b/apiserver/test/cluster/template/simple index d2e89f2e2d..cbe73ad2e1 100644 --- a/apiserver/test/cluster/template/simple +++ b/apiserver/test/cluster/template/simple @@ -1,5 +1,5 @@ # Create -curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/compute_templates' \ +curl -X POST 'localhost:8888/apis/v1/namespaces/default/compute_templates' \ --header 'Content-Type: application/json' \ --data '{ "name": "default-template", @@ -9,18 +9,18 @@ curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/compute_templates' }' # List for given namespace -curl 'localhost:8888/apis/v1alpha2/namespaces/default/compute_templates' \ +curl 'localhost:8888/apis/v1/namespaces/default/compute_templates' \ --header 'Content-Type: application/json' # List for all namespaces -curl 'localhost:8888/apis/v1alpha2/compute_templates' \ +curl 'localhost:8888/apis/v1/compute_templates' \ --header 'Content-Type: application/json' # Get by name -curl 'localhost:8888/apis/v1alpha2/namespaces/default/compute_templates/default-template' \ +curl 'localhost:8888/apis/v1/namespaces/default/compute_templates/default-template' \ --header 'Content-Type: application/json' # Delete by name -curl -X DELETE 'localhost:8888/apis/v1alpha2/namespaces/default/compute_templates/default-template' \ +curl -X DELETE 'localhost:8888/apis/v1/namespaces/default/compute_templates/default-template' \ --header 'Content-Type: application/json' diff --git a/apiserver/test/job/job b/apiserver/test/job/job index 2aac03b850..e633c9638b 100644 --- a/apiserver/test/job/job +++ b/apiserver/test/job/job @@ -1,4 +1,4 @@ -curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/jobs' \ +curl -X POST 'localhost:8888/apis/v1/namespaces/default/jobs' \ --header 'Content-Type: application/json' \ --data '{ "name": "job-test", diff --git a/proto/cluster.proto b/proto/cluster.proto index 3905444ec7..bea8e92af3 100644 --- a/proto/cluster.proto +++ b/proto/cluster.proto @@ -27,7 +27,7 @@ service ClusterService { // Creates a new Cluster. rpc CreateCluster(CreateClusterRequest) returns (Cluster) { option (google.api.http) = { - post: "/apis/v1alpha2/namespaces/{namespace}/clusters" + post: "/apis/v1/namespaces/{namespace}/clusters" body: "cluster" }; } @@ -35,21 +35,21 @@ service ClusterService { // Finds a specific Cluster by ID. rpc GetCluster(GetClusterRequest) returns (Cluster) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/clusters/{name}" + get: "/apis/v1/namespaces/{namespace}/clusters/{name}" }; } // Finds all Clusters in a given namespace. Supports pagination, and sorting on certain fields. rpc ListCluster(ListClustersRequest) returns (ListClustersResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/clusters" + get: "/apis/v1/namespaces/{namespace}/clusters" }; } // Finds all Clusters in all namespaces. Supports pagination, and sorting on certain fields. rpc ListAllClusters(ListAllClustersRequest) returns (ListAllClustersResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/clusters" + get: "/apis/v1/clusters" }; } @@ -58,7 +58,7 @@ service ClusterService { // deleting the cluster. rpc DeleteCluster(DeleteClusterRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/apis/v1alpha2/namespaces/{namespace}/clusters/{name}" + delete: "/apis/v1/namespaces/{namespace}/clusters/{name}" }; } } diff --git a/proto/config.proto b/proto/config.proto index a1b3479634..0005fd9ff2 100644 --- a/proto/config.proto +++ b/proto/config.proto @@ -27,7 +27,7 @@ service ComputeTemplateService { // Creates a new compute template. rpc CreateComputeTemplate(CreateComputeTemplateRequest) returns (ComputeTemplate) { option (google.api.http) = { - post: "/apis/v1alpha2/namespaces/{namespace}/compute_templates" + post: "/apis/v1/namespaces/{namespace}/compute_templates" body: "compute_template" }; } @@ -35,28 +35,28 @@ service ComputeTemplateService { // Finds a specific compute template by its name and namespace. rpc GetComputeTemplate(GetComputeTemplateRequest) returns (ComputeTemplate) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}" + get: "/apis/v1/namespaces/{namespace}/compute_templates/{name}" }; } // Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields. rpc ListComputeTemplates(ListComputeTemplatesRequest) returns (ListComputeTemplatesResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/compute_templates" + get: "/apis/v1/namespaces/{namespace}/compute_templates" }; } // Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields. rpc ListAllComputeTemplates(ListAllComputeTemplatesRequest) returns (ListAllComputeTemplatesResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/compute_templates" + get: "/apis/v1/compute_templates" }; } // Deletes a compute template by its name and namespace rpc DeleteComputeTemplate(DeleteComputeTemplateRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}" + delete: "/apis/v1/namespaces/{namespace}/compute_templates/{name}" }; } } @@ -135,7 +135,7 @@ service ImageTemplateService { // Not implemented. Creates a new ImageTemplate. rpc CreateImageTemplate(CreateImageTemplateRequest) returns (ImageTemplate) { option (google.api.http) = { - post: "/apis/v1alpha2/image_templates" + post: "/apis/v1/image_templates" body: "image_template" }; } @@ -143,21 +143,21 @@ service ImageTemplateService { // Not implemented. Finds a specific ImageTemplate by ID. rpc GetImageTemplate(GetImageTemplateRequest) returns (ImageTemplate) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}" + get: "/apis/v1/namespaces/{namespace}/image_templates/{name}" }; } // Not Implemented. Finds all ImageTemplates. Supports pagination, and sorting on certain fields. rpc ListImageTemplates(ListImageTemplatesRequest) returns (ListImageTemplatesResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/image_templates" + get: "/apis/v1/namespaces/{namespace}/image_templates" }; } // Not implemented. Deletes an ImageTemplate. rpc DeleteImageTemplate(DeleteImageTemplateRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}" + delete: "/apis/v1/namespaces/{namespace}/image_templates/{name}" }; } } diff --git a/proto/go_client/cluster.pb.go b/proto/go_client/cluster.pb.go index b1aee90c27..4e63ba7855 100644 --- a/proto/go_client/cluster.pb.go +++ b/proto/go_client/cluster.pb.go @@ -1883,53 +1883,51 @@ var file_cluster_proto_rawDesc = []byte{ 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xe0, - 0x41, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x32, 0xff, 0x04, 0x0a, 0x0e, 0x43, 0x6c, - 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7d, 0x0a, 0x0d, + 0x41, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x32, 0xe0, 0x04, 0x0a, 0x0e, 0x43, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x77, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x3f, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x39, 0x22, 0x2e, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, - 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x73, 0x3a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x75, 0x0a, 0x0a, 0x47, - 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, 0x2f, 0x61, 0x70, - 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, - 0x65, 0x7d, 0x12, 0x7e, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, - 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, - 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x73, 0x12, 0x71, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x61, - 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3d, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x37, 0x2a, 0x35, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, - 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, - 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, 0x54, 0x5a, 0x2e, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, 0x79, 0x2d, 0x70, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, 0x79, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x92, 0x41, 0x21, - 0x2a, 0x01, 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x11, - 0x12, 0x0f, 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x33, 0x22, 0x28, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x3a, 0x07, 0x63, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x6f, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, + 0x74, 0x65, 0x72, 0x12, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x43, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x37, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x12, 0x2f, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2f, + 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x78, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, + 0x73, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x12, 0x28, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, + 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, + 0x12, 0x6b, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, + 0x6c, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x61, 0x70, 0x69, + 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x7d, 0x0a, + 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1b, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, + 0x70, 0x74, 0x79, 0x22, 0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x2a, 0x2f, 0x2f, 0x61, 0x70, + 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, + 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, 0x54, 0x5a, 0x2e, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, 0x79, 0x2d, 0x70, + 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, 0x79, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x92, 0x41, + 0x21, 0x2a, 0x01, 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, + 0x11, 0x12, 0x0f, 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/go_client/cluster.pb.gw.go b/proto/go_client/cluster.pb.gw.go index 25ec506432..162911c909 100644 --- a/proto/go_client/cluster.pb.gw.go +++ b/proto/go_client/cluster.pb.gw.go @@ -325,7 +325,7 @@ func RegisterClusterServiceHandlerServer(ctx context.Context, mux *runtime.Serve var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/CreateCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/CreateCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -348,7 +348,7 @@ func RegisterClusterServiceHandlerServer(ctx context.Context, mux *runtime.Serve var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/GetCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/GetCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -371,7 +371,7 @@ func RegisterClusterServiceHandlerServer(ctx context.Context, mux *runtime.Serve var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/ListCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/ListCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -394,7 +394,7 @@ func RegisterClusterServiceHandlerServer(ctx context.Context, mux *runtime.Serve var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/ListAllClusters", runtime.WithHTTPPathPattern("/apis/v1alpha2/clusters")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/ListAllClusters", runtime.WithHTTPPathPattern("/apis/v1/clusters")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -417,7 +417,7 @@ func RegisterClusterServiceHandlerServer(ctx context.Context, mux *runtime.Serve var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/DeleteCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ClusterService/DeleteCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -479,7 +479,7 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/CreateCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/CreateCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -499,7 +499,7 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/GetCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/GetCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -519,7 +519,7 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/ListCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/ListCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -539,7 +539,7 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/ListAllClusters", runtime.WithHTTPPathPattern("/apis/v1alpha2/clusters")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/ListAllClusters", runtime.WithHTTPPathPattern("/apis/v1/clusters")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -559,7 +559,7 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/DeleteCluster", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/clusters/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ClusterService/DeleteCluster", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/clusters/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -579,15 +579,15 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve } var ( - pattern_ClusterService_CreateCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "clusters"}, "")) + pattern_ClusterService_CreateCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "clusters"}, "")) - pattern_ClusterService_GetCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "clusters", "name"}, "")) + pattern_ClusterService_GetCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "clusters", "name"}, "")) - pattern_ClusterService_ListCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "clusters"}, "")) + pattern_ClusterService_ListCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "clusters"}, "")) - pattern_ClusterService_ListAllClusters_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1alpha2", "clusters"}, "")) + pattern_ClusterService_ListAllClusters_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1", "clusters"}, "")) - pattern_ClusterService_DeleteCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "clusters", "name"}, "")) + pattern_ClusterService_DeleteCluster_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "clusters", "name"}, "")) ) var ( diff --git a/proto/go_client/config.pb.go b/proto/go_client/config.pb.go index b2a85d241f..369dd6ee16 100644 --- a/proto/go_client/config.pb.go +++ b/proto/go_client/config.pb.go @@ -1166,102 +1166,99 @@ var file_config_proto_rawDesc = []byte{ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x32, 0xb2, 0x06, 0x0a, 0x16, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, - 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa7, 0x01, + 0x38, 0x01, 0x32, 0x94, 0x06, 0x0a, 0x16, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, + 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa1, 0x01, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x23, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x22, 0x51, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x4b, 0x22, 0x37, 0x2f, 0x61, - 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x73, 0x3a, 0x10, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, - 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x96, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, - 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x20, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, - 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, - 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x22, 0x46, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x40, - 0x12, 0x3e, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, - 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, - 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, - 0x12, 0xa0, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, - 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, - 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, + 0x6c, 0x61, 0x74, 0x65, 0x22, 0x4b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x45, 0x22, 0x31, 0x2f, 0x61, + 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6f, + 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x3a, + 0x10, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x12, 0x90, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, + 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, + 0x74, 0x65, 0x22, 0x40, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3a, 0x12, 0x38, 0x2f, 0x61, 0x70, 0x69, + 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, + 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x70, + 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x2f, 0x7b, 0x6e, + 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x9a, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, + 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, - 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x3f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x39, 0x12, 0x37, 0x2f, 0x61, 0x70, 0x69, - 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, - 0x74, 0x65, 0x73, 0x12, 0x92, 0x01, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, - 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, - 0x25, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, - 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, - 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, - 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, - 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x9c, 0x01, 0x0a, 0x15, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, - 0x74, 0x65, 0x12, 0x23, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, - 0x46, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x40, 0x2a, 0x3e, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, - 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x63, + 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, + 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, 0x12, 0x31, + 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, + 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x73, 0x12, 0x8c, 0x01, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6d, + 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x25, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6d, + 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, - 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x32, 0xe4, 0x04, 0x0a, 0x14, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x12, 0x86, 0x01, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, - 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x73, - 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x3a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x8e, 0x01, 0x0a, 0x10, 0x47, 0x65, - 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x1e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, - 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x22, 0x44, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3e, 0x12, 0x3c, 0x2f, 0x61, - 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, - 0x74, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x98, 0x01, 0x0a, 0x12, 0x4c, - 0x69, 0x73, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, - 0x73, 0x12, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, - 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, + 0x12, 0x96, 0x01, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x75, + 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x23, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, + 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x40, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3a, 0x2a, + 0x38, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, + 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x32, 0xcc, 0x04, 0x0a, 0x14, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x21, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, + 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x22, 0x18, 0x2f, 0x61, 0x70, + 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, + 0x6c, 0x61, 0x74, 0x65, 0x73, 0x3a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, + 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x88, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x22, 0x3e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x38, 0x12, 0x36, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, + 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, + 0x12, 0x92, 0x01, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, + 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, + 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x37, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x31, 0x12, 0x2f, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, - 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x96, 0x01, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x90, 0x01, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x44, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3e, - 0x2a, 0x3c, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, - 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x65, - 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, 0x54, - 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, 0x79, - 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, 0x79, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, - 0x92, 0x41, 0x21, 0x2a, 0x01, 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x12, 0x11, 0x12, 0x0f, 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x38, + 0x2a, 0x36, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, 0x54, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, + 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x92, 0x41, 0x21, 0x2a, 0x01, 0x01, + 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x11, 0x12, 0x0f, 0x0a, + 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/go_client/config.pb.gw.go b/proto/go_client/config.pb.gw.go index 5735e2a52e..27ce40ff93 100644 --- a/proto/go_client/config.pb.gw.go +++ b/proto/go_client/config.pb.gw.go @@ -573,7 +573,7 @@ func RegisterComputeTemplateServiceHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/CreateComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/CreateComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -596,7 +596,7 @@ func RegisterComputeTemplateServiceHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/GetComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/GetComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -619,7 +619,7 @@ func RegisterComputeTemplateServiceHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/ListComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/ListComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -642,7 +642,7 @@ func RegisterComputeTemplateServiceHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/ListAllComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1alpha2/compute_templates")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/ListAllComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1/compute_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -665,7 +665,7 @@ func RegisterComputeTemplateServiceHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/DeleteComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ComputeTemplateService/DeleteComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -697,7 +697,7 @@ func RegisterImageTemplateServiceHandlerServer(ctx context.Context, mux *runtime var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/CreateImageTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/image_templates")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/CreateImageTemplate", runtime.WithHTTPPathPattern("/apis/v1/image_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -720,7 +720,7 @@ func RegisterImageTemplateServiceHandlerServer(ctx context.Context, mux *runtime var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/GetImageTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/GetImageTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/image_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -743,7 +743,7 @@ func RegisterImageTemplateServiceHandlerServer(ctx context.Context, mux *runtime var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/ListImageTemplates", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/image_templates")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/ListImageTemplates", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/image_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -766,7 +766,7 @@ func RegisterImageTemplateServiceHandlerServer(ctx context.Context, mux *runtime var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/DeleteImageTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.ImageTemplateService/DeleteImageTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/image_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -828,7 +828,7 @@ func RegisterComputeTemplateServiceHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/CreateComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/CreateComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -848,7 +848,7 @@ func RegisterComputeTemplateServiceHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/GetComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/GetComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -868,7 +868,7 @@ func RegisterComputeTemplateServiceHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/ListComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/ListComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -888,7 +888,7 @@ func RegisterComputeTemplateServiceHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/ListAllComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1alpha2/compute_templates")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/ListAllComputeTemplates", runtime.WithHTTPPathPattern("/apis/v1/compute_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -908,7 +908,7 @@ func RegisterComputeTemplateServiceHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/DeleteComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ComputeTemplateService/DeleteComputeTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/compute_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -928,15 +928,15 @@ func RegisterComputeTemplateServiceHandlerClient(ctx context.Context, mux *runti } var ( - pattern_ComputeTemplateService_CreateComputeTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "compute_templates"}, "")) + pattern_ComputeTemplateService_CreateComputeTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "compute_templates"}, "")) - pattern_ComputeTemplateService_GetComputeTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "compute_templates", "name"}, "")) + pattern_ComputeTemplateService_GetComputeTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "compute_templates", "name"}, "")) - pattern_ComputeTemplateService_ListComputeTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "compute_templates"}, "")) + pattern_ComputeTemplateService_ListComputeTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "compute_templates"}, "")) - pattern_ComputeTemplateService_ListAllComputeTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1alpha2", "compute_templates"}, "")) + pattern_ComputeTemplateService_ListAllComputeTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1", "compute_templates"}, "")) - pattern_ComputeTemplateService_DeleteComputeTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "compute_templates", "name"}, "")) + pattern_ComputeTemplateService_DeleteComputeTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "compute_templates", "name"}, "")) ) var ( @@ -993,7 +993,7 @@ func RegisterImageTemplateServiceHandlerClient(ctx context.Context, mux *runtime ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/CreateImageTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/image_templates")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/CreateImageTemplate", runtime.WithHTTPPathPattern("/apis/v1/image_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1013,7 +1013,7 @@ func RegisterImageTemplateServiceHandlerClient(ctx context.Context, mux *runtime ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/GetImageTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/GetImageTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/image_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1033,7 +1033,7 @@ func RegisterImageTemplateServiceHandlerClient(ctx context.Context, mux *runtime ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/ListImageTemplates", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/image_templates")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/ListImageTemplates", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/image_templates")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1053,7 +1053,7 @@ func RegisterImageTemplateServiceHandlerClient(ctx context.Context, mux *runtime ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/DeleteImageTemplate", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.ImageTemplateService/DeleteImageTemplate", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/image_templates/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1073,13 +1073,13 @@ func RegisterImageTemplateServiceHandlerClient(ctx context.Context, mux *runtime } var ( - pattern_ImageTemplateService_CreateImageTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1alpha2", "image_templates"}, "")) + pattern_ImageTemplateService_CreateImageTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1", "image_templates"}, "")) - pattern_ImageTemplateService_GetImageTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "image_templates", "name"}, "")) + pattern_ImageTemplateService_GetImageTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "image_templates", "name"}, "")) - pattern_ImageTemplateService_ListImageTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "image_templates"}, "")) + pattern_ImageTemplateService_ListImageTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "image_templates"}, "")) - pattern_ImageTemplateService_DeleteImageTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "image_templates", "name"}, "")) + pattern_ImageTemplateService_DeleteImageTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "image_templates", "name"}, "")) ) var ( diff --git a/proto/go_client/job.pb.go b/proto/go_client/job.pb.go index 1b24987fe6..103ebd35dc 100644 --- a/proto/go_client/job.pb.go +++ b/proto/go_client/job.pb.go @@ -781,50 +781,48 @@ var file_job_proto_rawDesc = []byte{ 0x74, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x32, 0xd8, 0x04, 0x0a, 0x0d, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x72, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x32, 0xba, 0x04, 0x0a, 0x0d, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6c, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x4a, 0x6f, - 0x62, 0x22, 0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x22, 0x2a, 0x2f, 0x61, 0x70, 0x69, 0x73, - 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, - 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x3a, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x6e, 0x0a, 0x09, 0x47, 0x65, - 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x47, 0x65, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x22, - 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, 0x12, 0x31, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, - 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x6a, - 0x6f, 0x62, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x78, 0x0a, 0x0b, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x12, 0x2a, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, - 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, - 0x6a, 0x6f, 0x62, 0x73, 0x12, 0x6a, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, - 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x61, 0x70, - 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6a, 0x6f, 0x62, 0x73, - 0x12, 0x7d, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, - 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, - 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, 0x2a, 0x31, 0x2f, 0x61, - 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, - 0x54, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, - 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, - 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x92, 0x41, 0x21, 0x2a, 0x01, 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x12, 0x11, 0x12, 0x0f, 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x22, 0x24, 0x2f, 0x61, 0x70, 0x69, 0x73, + 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, + 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x3a, + 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x68, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, + 0x62, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x61, 0x79, + 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x2d, 0x12, 0x2b, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, + 0x65, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x72, + 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x19, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x61, + 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x6a, 0x6f, + 0x62, 0x73, 0x12, 0x64, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, + 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, + 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x61, 0x70, 0x69, 0x73, + 0x2f, 0x76, 0x31, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x12, 0x77, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x61, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x33, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x2d, 0x2a, 0x2b, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, + 0x7d, 0x42, 0x54, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x72, 0x61, 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, + 0x72, 0x61, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x92, 0x41, 0x21, 0x2a, 0x01, 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x12, 0x11, 0x12, 0x0f, 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/go_client/job.pb.gw.go b/proto/go_client/job.pb.gw.go index 86f8fea9e9..7a90b31de8 100644 --- a/proto/go_client/job.pb.gw.go +++ b/proto/go_client/job.pb.gw.go @@ -325,7 +325,7 @@ func RegisterRayJobServiceHandlerServer(ctx context.Context, mux *runtime.ServeM var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/CreateRayJob", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/CreateRayJob", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -348,7 +348,7 @@ func RegisterRayJobServiceHandlerServer(ctx context.Context, mux *runtime.ServeM var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/GetRayJob", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/GetRayJob", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -371,7 +371,7 @@ func RegisterRayJobServiceHandlerServer(ctx context.Context, mux *runtime.ServeM var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/ListRayJobs", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/ListRayJobs", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -394,7 +394,7 @@ func RegisterRayJobServiceHandlerServer(ctx context.Context, mux *runtime.ServeM var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/ListAllRayJobs", runtime.WithHTTPPathPattern("/apis/v1alpha2/jobs")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/ListAllRayJobs", runtime.WithHTTPPathPattern("/apis/v1/jobs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -417,7 +417,7 @@ func RegisterRayJobServiceHandlerServer(ctx context.Context, mux *runtime.ServeM var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/DeleteRayJob", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayJobService/DeleteRayJob", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -479,7 +479,7 @@ func RegisterRayJobServiceHandlerClient(ctx context.Context, mux *runtime.ServeM ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/CreateRayJob", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/CreateRayJob", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -499,7 +499,7 @@ func RegisterRayJobServiceHandlerClient(ctx context.Context, mux *runtime.ServeM ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/GetRayJob", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/GetRayJob", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -519,7 +519,7 @@ func RegisterRayJobServiceHandlerClient(ctx context.Context, mux *runtime.ServeM ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/ListRayJobs", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/ListRayJobs", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -539,7 +539,7 @@ func RegisterRayJobServiceHandlerClient(ctx context.Context, mux *runtime.ServeM ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/ListAllRayJobs", runtime.WithHTTPPathPattern("/apis/v1alpha2/jobs")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/ListAllRayJobs", runtime.WithHTTPPathPattern("/apis/v1/jobs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -559,7 +559,7 @@ func RegisterRayJobServiceHandlerClient(ctx context.Context, mux *runtime.ServeM ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/DeleteRayJob", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/jobs/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayJobService/DeleteRayJob", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/jobs/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -579,15 +579,15 @@ func RegisterRayJobServiceHandlerClient(ctx context.Context, mux *runtime.ServeM } var ( - pattern_RayJobService_CreateRayJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "jobs"}, "")) + pattern_RayJobService_CreateRayJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "jobs"}, "")) - pattern_RayJobService_GetRayJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "jobs", "name"}, "")) + pattern_RayJobService_GetRayJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "jobs", "name"}, "")) - pattern_RayJobService_ListRayJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "jobs"}, "")) + pattern_RayJobService_ListRayJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "jobs"}, "")) - pattern_RayJobService_ListAllRayJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1alpha2", "jobs"}, "")) + pattern_RayJobService_ListAllRayJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1", "jobs"}, "")) - pattern_RayJobService_DeleteRayJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "jobs", "name"}, "")) + pattern_RayJobService_DeleteRayJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "jobs", "name"}, "")) ) var ( diff --git a/proto/go_client/serve.pb.go b/proto/go_client/serve.pb.go index 8f26b4b9cb..343ae8cd1a 100644 --- a/proto/go_client/serve.pb.go +++ b/proto/go_client/serve.pb.go @@ -1784,76 +1784,73 @@ var file_serve_proto_rawDesc = []byte{ 0x28, 0x05, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x0b, 0x6d, 0x69, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, - 0x0b, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x32, 0xea, 0x07, 0x0a, + 0x0b, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x32, 0xc0, 0x07, 0x0a, 0x0f, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x12, 0x86, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, + 0x12, 0x80, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, - 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x3f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x39, - 0x22, 0x2e, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, - 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, - 0x3a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8d, 0x01, 0x0a, 0x10, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x22, 0x46, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x40, 0x1a, 0x35, 0x2f, 0x61, 0x70, 0x69, 0x73, - 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, - 0x3a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xaa, 0x01, 0x0a, 0x17, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x25, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, - 0x55, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x4f, 0x32, 0x3d, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, - 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, + 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, + 0x22, 0x28, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x07, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x12, 0x87, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, + 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x40, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x3a, 0x1a, 0x2f, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, + 0x61, 0x6d, 0x65, 0x7d, 0x3a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa4, 0x01, + 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x25, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x22, 0x4f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x49, 0x32, 0x37, 0x2f, 0x61, 0x70, + 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, + 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x73, 0x3a, 0x0e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x78, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x52, 0x61, 0x79, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, + 0x74, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x12, 0x2f, 0x2f, + 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x3a, 0x0e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7e, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x52, 0x61, 0x79, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x47, 0x65, 0x74, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x61, 0x79, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, - 0x35, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x32, 0x2f, - 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, - 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x88, 0x01, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x30, 0x12, 0x2e, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, - 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x73, 0x12, 0x7a, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x82, + 0x01, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, + 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x12, 0x28, 0x2f, 0x61, 0x70, 0x69, 0x73, + 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, + 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x12, 0x74, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, + 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, - 0x70, 0x68, 0x61, 0x32, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x89, 0x01, - 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x37, 0x2a, 0x35, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, - 0x61, 0x32, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, 0x54, 0x5a, 0x2e, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x6a, - 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x92, 0x41, 0x21, 0x2a, 0x01, - 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x11, 0x12, 0x0f, - 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x61, 0x79, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x19, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, + 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x10, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x52, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x61, 0x79, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x2a, 0x2f, + 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, + 0x54, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x61, + 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x61, + 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x92, 0x41, 0x21, 0x2a, 0x01, 0x01, 0x52, 0x1c, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x12, 0x11, 0x12, 0x0f, 0x0a, 0x0d, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/go_client/serve.pb.gw.go b/proto/go_client/serve.pb.gw.go index aa9954b72f..6cb803500e 100644 --- a/proto/go_client/serve.pb.gw.go +++ b/proto/go_client/serve.pb.gw.go @@ -537,7 +537,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/CreateRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/CreateRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -560,7 +560,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/UpdateRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/UpdateRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -583,7 +583,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/UpdateRayServiceConfigs", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}/configs")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/UpdateRayServiceConfigs", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}/configs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -606,7 +606,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/GetRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/GetRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -629,7 +629,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/ListRayServices", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/ListRayServices", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -652,7 +652,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/ListAllRayServices", runtime.WithHTTPPathPattern("/apis/v1alpha2/services")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/ListAllRayServices", runtime.WithHTTPPathPattern("/apis/v1/services")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -675,7 +675,7 @@ func RegisterRayServeServiceHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/DeleteRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.RayServeService/DeleteRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -737,7 +737,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/CreateRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/CreateRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -757,7 +757,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/UpdateRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/UpdateRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -777,7 +777,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/UpdateRayServiceConfigs", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}/configs")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/UpdateRayServiceConfigs", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}/configs")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -797,7 +797,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/GetRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/GetRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -817,7 +817,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/ListRayServices", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/ListRayServices", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -837,7 +837,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/ListAllRayServices", runtime.WithHTTPPathPattern("/apis/v1alpha2/services")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/ListAllRayServices", runtime.WithHTTPPathPattern("/apis/v1/services")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -857,7 +857,7 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/DeleteRayService", runtime.WithHTTPPathPattern("/apis/v1alpha2/namespaces/{namespace}/services/{name}")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.RayServeService/DeleteRayService", runtime.WithHTTPPathPattern("/apis/v1/namespaces/{namespace}/services/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -877,19 +877,19 @@ func RegisterRayServeServiceHandlerClient(ctx context.Context, mux *runtime.Serv } var ( - pattern_RayServeService_CreateRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "services"}, "")) + pattern_RayServeService_CreateRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "services"}, "")) - pattern_RayServeService_UpdateRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "services", "name"}, "")) + pattern_RayServeService_UpdateRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "services", "name"}, "")) - pattern_RayServeService_UpdateRayServiceConfigs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"apis", "v1alpha2", "namespaces", "namespace", "services", "name", "configs"}, "")) + pattern_RayServeService_UpdateRayServiceConfigs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"apis", "v1", "namespaces", "namespace", "services", "name", "configs"}, "")) - pattern_RayServeService_GetRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "services", "name"}, "")) + pattern_RayServeService_GetRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "services", "name"}, "")) - pattern_RayServeService_ListRayServices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1alpha2", "namespaces", "namespace", "services"}, "")) + pattern_RayServeService_ListRayServices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"apis", "v1", "namespaces", "namespace", "services"}, "")) - pattern_RayServeService_ListAllRayServices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1alpha2", "services"}, "")) + pattern_RayServeService_ListAllRayServices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"apis", "v1", "services"}, "")) - pattern_RayServeService_DeleteRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1alpha2", "namespaces", "namespace", "services", "name"}, "")) + pattern_RayServeService_DeleteRayService_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"apis", "v1", "namespaces", "namespace", "services", "name"}, "")) ) var ( diff --git a/proto/job.proto b/proto/job.proto index c6a1f36e25..404fe4824e 100644 --- a/proto/job.proto +++ b/proto/job.proto @@ -29,7 +29,7 @@ service RayJobService { // Creates a new job. rpc CreateRayJob(CreateRayJobRequest) returns (RayJob) { option (google.api.http) = { - post: "/apis/v1alpha2/namespaces/{namespace}/jobs" + post: "/apis/v1/namespaces/{namespace}/jobs" body: "job" }; } @@ -37,28 +37,28 @@ service RayJobService { // Finds a specific job by its name and namespace. rpc GetRayJob(GetRayJobRequest) returns (RayJob) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/jobs/{name}" + get: "/apis/v1/namespaces/{namespace}/jobs/{name}" }; } // Finds all job in a given namespace. Supports pagination, and sorting on certain fields. rpc ListRayJobs(ListRayJobsRequest) returns (ListRayJobsResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/jobs" + get: "/apis/v1/namespaces/{namespace}/jobs" }; } // Finds all job in all namespaces. Supports pagination, and sorting on certain fields. rpc ListAllRayJobs(ListAllRayJobsRequest) returns (ListAllRayJobsResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/jobs" + get: "/apis/v1/jobs" }; } // Deletes a job by its name and namespace. rpc DeleteRayJob(DeleteRayJobRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/apis/v1alpha2/namespaces/{namespace}/jobs/{name}" + delete: "/apis/v1/namespaces/{namespace}/jobs/{name}" }; } } diff --git a/proto/kuberay_api.swagger.json b/proto/kuberay_api.swagger.json index 9b96d587e0..712f46c3a7 100644 --- a/proto/kuberay_api.swagger.json +++ b/proto/kuberay_api.swagger.json @@ -24,7 +24,7 @@ "application/json" ], "paths": { - "/apis/v1alpha2/clusters": { + "/apis/v1/clusters": { "get": { "summary": "Finds all Clusters in all namespaces. Supports pagination, and sorting on certain fields.", "operationId": "ClusterService_ListAllClusters", @@ -47,7 +47,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/clusters": { + "/apis/v1/namespaces/{namespace}/clusters": { "get": { "summary": "Finds all Clusters in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "ClusterService_ListCluster", @@ -118,7 +118,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/clusters/{name}": { + "/apis/v1/namespaces/{namespace}/clusters/{name}": { "get": { "summary": "Finds a specific Cluster by ID.", "operationId": "ClusterService_GetCluster", @@ -194,7 +194,7 @@ ] } }, - "/apis/v1alpha2/compute_templates": { + "/apis/v1/compute_templates": { "get": { "summary": "Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.", "operationId": "ComputeTemplateService_ListAllComputeTemplates", @@ -217,7 +217,7 @@ ] } }, - "/apis/v1alpha2/image_templates": { + "/apis/v1/image_templates": { "post": { "summary": "Not implemented. Creates a new ImageTemplate.", "operationId": "ImageTemplateService_CreateImageTemplate", @@ -258,7 +258,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/compute_templates": { + "/apis/v1/namespaces/{namespace}/compute_templates": { "get": { "summary": "Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "ComputeTemplateService_ListComputeTemplates", @@ -329,7 +329,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}": { + "/apis/v1/namespaces/{namespace}/compute_templates/{name}": { "get": { "summary": "Finds a specific compute template by its name and namespace.", "operationId": "ComputeTemplateService_GetComputeTemplate", @@ -405,7 +405,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/image_templates": { + "/apis/v1/namespaces/{namespace}/image_templates": { "get": { "summary": "Not Implemented. Finds all ImageTemplates. Supports pagination, and sorting on certain fields.", "operationId": "ImageTemplateService_ListImageTemplates", @@ -437,7 +437,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}": { + "/apis/v1/namespaces/{namespace}/image_templates/{name}": { "get": { "summary": "Not implemented. Finds a specific ImageTemplate by ID.", "operationId": "ImageTemplateService_GetImageTemplate", @@ -513,7 +513,7 @@ ] } }, - "/apis/v1alpha2/jobs": { + "/apis/v1/jobs": { "get": { "summary": "Finds all job in all namespaces. Supports pagination, and sorting on certain fields.", "operationId": "RayJobService_ListAllRayJobs", @@ -536,7 +536,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/jobs": { + "/apis/v1/namespaces/{namespace}/jobs": { "get": { "summary": "Finds all job in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "RayJobService_ListRayJobs", @@ -607,7 +607,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/jobs/{name}": { + "/apis/v1/namespaces/{namespace}/jobs/{name}": { "get": { "summary": "Finds a specific job by its name and namespace.", "operationId": "RayJobService_GetRayJob", @@ -683,7 +683,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/services": { + "/apis/v1/namespaces/{namespace}/services": { "get": { "summary": "Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "RayServeService_ListRayServices", @@ -769,7 +769,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/services/{name}": { + "/apis/v1/namespaces/{namespace}/services/{name}": { "get": { "summary": "Find a specific ray serve by name and namespace.", "operationId": "RayServeService_GetRayService", @@ -891,7 +891,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/services/{name}/configs": { + "/apis/v1/namespaces/{namespace}/services/{name}/configs": { "patch": { "summary": "Update a ray serve configs.\nPatch mode update without possible deletion the existing raycluster under the hood. \nonly support update the service configs and worker.", "operationId": "RayServeService_UpdateRayServiceConfigs", @@ -939,7 +939,7 @@ ] } }, - "/apis/v1alpha2/services": { + "/apis/v1/services": { "get": { "summary": "Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "RayServeService_ListAllRayServices", diff --git a/proto/serve.proto b/proto/serve.proto index 0bde7f72b9..7b67ff761b 100644 --- a/proto/serve.proto +++ b/proto/serve.proto @@ -29,7 +29,7 @@ service RayServeService { // Create a new ray serve. rpc CreateRayService(CreateRayServiceRequest) returns (RayService) { option (google.api.http) = { - post: "/apis/v1alpha2/namespaces/{namespace}/services" + post: "/apis/v1/namespaces/{namespace}/services" body: "service" }; } @@ -38,7 +38,7 @@ service RayServeService { // We may rpc UpdateRayService(UpdateRayServiceRequest) returns (RayService) { option (google.api.http) = { - put: "/apis/v1alpha2/namespaces/{namespace}/services/{name}" + put: "/apis/v1/namespaces/{namespace}/services/{name}" body: "service" }; } @@ -48,7 +48,7 @@ service RayServeService { // only support update the service configs and worker. rpc UpdateRayServiceConfigs(UpdateRayServiceConfigsRequest) returns (RayService) { option (google.api.http) = { - patch: "/apis/v1alpha2/namespaces/{namespace}/services/{name}/configs" + patch: "/apis/v1/namespaces/{namespace}/services/{name}/configs" body: "update_service" }; } @@ -56,27 +56,27 @@ service RayServeService { // Find a specific ray serve by name and namespace. rpc GetRayService(GetRayServiceRequest) returns (RayService) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/services/{name}" + get: "/apis/v1/namespaces/{namespace}/services/{name}" }; } // Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields. rpc ListRayServices(ListRayServicesRequest) returns (ListRayServicesResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/namespaces/{namespace}/services" + get: "/apis/v1/namespaces/{namespace}/services" }; } // Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields. rpc ListAllRayServices(ListAllRayServicesRequest) returns (ListAllRayServicesResponse) { option (google.api.http) = { - get: "/apis/v1alpha2/services" + get: "/apis/v1/services" }; } // Deletes a ray service by its name and namespace rpc DeleteRayService(DeleteRayServiceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/apis/v1alpha2/namespaces/{namespace}/services/{name}" + delete: "/apis/v1/namespaces/{namespace}/services/{name}" }; } } diff --git a/proto/swagger/cluster.swagger.json b/proto/swagger/cluster.swagger.json index c731ba4ba8..016ffab0d1 100644 --- a/proto/swagger/cluster.swagger.json +++ b/proto/swagger/cluster.swagger.json @@ -19,7 +19,7 @@ "application/json" ], "paths": { - "/apis/v1alpha2/clusters": { + "/apis/v1/clusters": { "get": { "summary": "Finds all Clusters in all namespaces. Supports pagination, and sorting on certain fields.", "operationId": "ClusterService_ListAllClusters", @@ -42,7 +42,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/clusters": { + "/apis/v1/namespaces/{namespace}/clusters": { "get": { "summary": "Finds all Clusters in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "ClusterService_ListCluster", @@ -113,7 +113,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/clusters/{name}": { + "/apis/v1/namespaces/{namespace}/clusters/{name}": { "get": { "summary": "Finds a specific Cluster by ID.", "operationId": "ClusterService_GetCluster", diff --git a/proto/swagger/config.swagger.json b/proto/swagger/config.swagger.json index bee8c66a5c..d2a041f11b 100644 --- a/proto/swagger/config.swagger.json +++ b/proto/swagger/config.swagger.json @@ -22,7 +22,7 @@ "application/json" ], "paths": { - "/apis/v1alpha2/compute_templates": { + "/apis/v1/compute_templates": { "get": { "summary": "Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.", "operationId": "ComputeTemplateService_ListAllComputeTemplates", @@ -45,7 +45,7 @@ ] } }, - "/apis/v1alpha2/image_templates": { + "/apis/v1/image_templates": { "post": { "summary": "Not implemented. Creates a new ImageTemplate.", "operationId": "ImageTemplateService_CreateImageTemplate", @@ -86,7 +86,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/compute_templates": { + "/apis/v1/namespaces/{namespace}/compute_templates": { "get": { "summary": "Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "ComputeTemplateService_ListComputeTemplates", @@ -157,7 +157,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/compute_templates/{name}": { + "/apis/v1/namespaces/{namespace}/compute_templates/{name}": { "get": { "summary": "Finds a specific compute template by its name and namespace.", "operationId": "ComputeTemplateService_GetComputeTemplate", @@ -233,7 +233,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/image_templates": { + "/apis/v1/namespaces/{namespace}/image_templates": { "get": { "summary": "Not Implemented. Finds all ImageTemplates. Supports pagination, and sorting on certain fields.", "operationId": "ImageTemplateService_ListImageTemplates", @@ -265,7 +265,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/image_templates/{name}": { + "/apis/v1/namespaces/{namespace}/image_templates/{name}": { "get": { "summary": "Not implemented. Finds a specific ImageTemplate by ID.", "operationId": "ImageTemplateService_GetImageTemplate", diff --git a/proto/swagger/job.swagger.json b/proto/swagger/job.swagger.json index 7bbe974824..64f9c96578 100644 --- a/proto/swagger/job.swagger.json +++ b/proto/swagger/job.swagger.json @@ -19,7 +19,7 @@ "application/json" ], "paths": { - "/apis/v1alpha2/jobs": { + "/apis/v1/jobs": { "get": { "summary": "Finds all job in all namespaces. Supports pagination, and sorting on certain fields.", "operationId": "RayJobService_ListAllRayJobs", @@ -42,7 +42,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/jobs": { + "/apis/v1/namespaces/{namespace}/jobs": { "get": { "summary": "Finds all job in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "RayJobService_ListRayJobs", @@ -113,7 +113,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/jobs/{name}": { + "/apis/v1/namespaces/{namespace}/jobs/{name}": { "get": { "summary": "Finds a specific job by its name and namespace.", "operationId": "RayJobService_GetRayJob", diff --git a/proto/swagger/serve.swagger.json b/proto/swagger/serve.swagger.json index 41f5e734f5..9f840a2d39 100644 --- a/proto/swagger/serve.swagger.json +++ b/proto/swagger/serve.swagger.json @@ -19,7 +19,7 @@ "application/json" ], "paths": { - "/apis/v1alpha2/namespaces/{namespace}/services": { + "/apis/v1/namespaces/{namespace}/services": { "get": { "summary": "Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "RayServeService_ListRayServices", @@ -105,7 +105,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/services/{name}": { + "/apis/v1/namespaces/{namespace}/services/{name}": { "get": { "summary": "Find a specific ray serve by name and namespace.", "operationId": "RayServeService_GetRayService", @@ -227,7 +227,7 @@ ] } }, - "/apis/v1alpha2/namespaces/{namespace}/services/{name}/configs": { + "/apis/v1/namespaces/{namespace}/services/{name}/configs": { "patch": { "summary": "Update a ray serve configs.\nPatch mode update without possible deletion the existing raycluster under the hood. \nonly support update the service configs and worker.", "operationId": "RayServeService_UpdateRayServiceConfigs", @@ -275,7 +275,7 @@ ] } }, - "/apis/v1alpha2/services": { + "/apis/v1/services": { "get": { "summary": "Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields.", "operationId": "RayServeService_ListAllRayServices", From c03e839b97739cd049d255713c8b5a151592397b Mon Sep 17 00:00:00 2001 From: blublinsky Date: Mon, 30 Oct 2023 21:36:00 +0000 Subject: [PATCH 2/2] fixed samples to use v1 --- apiserver/test/job/query | 8 ++++---- apiserver/test/service/service | 6 +++--- apiserver/test/service/serviceV1 | 2 +- apiserver/test/service/serviceV2 | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apiserver/test/job/query b/apiserver/test/job/query index f944885a32..02c7405005 100644 --- a/apiserver/test/job/query +++ b/apiserver/test/job/query @@ -2,17 +2,17 @@ Getting/Listing jobs 1. For a given ns -curl -X GET 'localhost:8888/apis/v1alpha2/namespaces/default/jobs' \ +curl -X GET 'localhost:8888/apis/v1/namespaces/default/jobs' \ --header 'Content-Type: application/json' 2. For any namespace -curl -X GET 'localhost:8888/apis/v1alpha2/jobs' \ +curl -X GET 'localhost:8888/apis/v1/jobs' \ --header 'Content-Type: application/json' 3 By namespace and name -curl -X GET 'localhost:8888/apis/v1alpha2/namespaces/default/jobs/job-test' \ +curl -X GET 'localhost:8888/apis/v1/namespaces/default/jobs/job-test' \ --header 'Content-Type: application/json' All of them return the same value (for our case with a single job deployed): @@ -74,5 +74,5 @@ All of them return the same value (for our case with a single job deployed): Deleting job -curl -X DELETE 'localhost:8888/apis/v1alpha2/namespaces/default/jobs/job-test' \ +curl -X DELETE 'localhost:8888/apis/v1/namespaces/default/jobs/job-test' \ --header 'Content-Type: application/json' diff --git a/apiserver/test/service/service b/apiserver/test/service/service index 869eef6f40..5cf3d68baa 100644 --- a/apiserver/test/service/service +++ b/apiserver/test/service/service @@ -1,10 +1,10 @@ # list for a namespace -curl 'localhost:8888/apis/v1alpha2/namespaces/default/services' \ +curl 'localhost:8888/apis/v1/namespaces/default/services' \ --header 'Content-Type: application/json' # list for all namespaces -curl 'localhost:8888/apis/v1alpha2/services' \ +curl 'localhost:8888/apis/v1/services' \ --header 'Content-Type: application/json' # Delete service -curl -X DELETE localhost:8888/apis/v1alpha2/namespaces/default/services/test-v2 \ No newline at end of file +curl -X DELETE localhost:8888/apis/v1/namespaces/default/services/test-v2 \ No newline at end of file diff --git a/apiserver/test/service/serviceV1 b/apiserver/test/service/serviceV1 index f1a82c2aa0..c542c003a5 100644 --- a/apiserver/test/service/serviceV1 +++ b/apiserver/test/service/serviceV1 @@ -1,4 +1,4 @@ -curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/services' \ +curl -X POST 'localhost:8888/apis/v1/namespaces/default/services' \ --header 'Content-Type: application/json' \ --data '{ "name": "test-v1", diff --git a/apiserver/test/service/serviceV2 b/apiserver/test/service/serviceV2 index 83b2ff8c17..38947267bd 100644 --- a/apiserver/test/service/serviceV2 +++ b/apiserver/test/service/serviceV2 @@ -1,4 +1,4 @@ -curl -X POST 'localhost:8888/apis/v1alpha2/namespaces/default/services' \ +curl -X POST 'localhost:8888/apis/v1/namespaces/default/services' \ --header 'Content-Type: application/json' \ --data '{ "name": "test-v2",