Add short names to CRDs (#209)

SeldonIO · May 17, 2022 · 22f5a4b · 22f5a4b
1 parent 4e4c863
commit 22f5a4b
Show file tree

Hide file tree

Showing 15 changed files with 8,368 additions and 2,121 deletions.
diff --git a/k8s/helm-charts/seldon-core-v2-crds/templates/seldon-v2-crds.yaml b/k8s/helm-charts/seldon-core-v2-crds/templates/seldon-v2-crds.yaml
@@ -11,6 +11,8 @@ spec:
     kind: Experiment
     listKind: ExperimentList
     plural: experiments
+    shortNames:
+    - mlx
     singular: experiment
   scope: Namespaced
   versions:
@@ -140,6 +142,8 @@ spec:
     kind: Explainer
     listKind: ExplainerList
     plural: explainers
+    shortNames:
+    - mle
     singular: explainer
   scope: Namespaced
   versions:
@@ -288,6 +292,8 @@ spec:
     kind: Model
     listKind: ModelList
     plural: models
+    shortNames:
+    - mlm
     singular: model
   scope: Namespaced
   versions:
@@ -450,6 +456,8 @@ spec:
     kind: Pipeline
     listKind: PipelineList
     plural: pipelines
+    shortNames:
+    - mlp
     singular: pipeline
   scope: Namespaced
   versions:
@@ -621,6 +629,8 @@ spec:
     kind: ServerConfig
     listKind: ServerConfigList
     plural: serverconfigs
+    shortNames:
+    - mlc
     singular: serverconfig
   scope: Namespaced
   versions:
@@ -7370,6 +7380,8 @@ spec:
     kind: Server
     listKind: ServerList
     plural: servers
+    shortNames:
+    - mls
     singular: server
   scope: Namespaced
   versions:

diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml
@@ -406,14 +406,34 @@ subjects:
 ---
 apiVersion: v1
 data:
-  agent.yaml: "rclone: \n  config_secrets: [\"seldon-rclone-gs-public\"]\nkafka:\n
-    \ active: true\n  broker: \"seldon-kafka-plain-bootstrap.kafka:9092\""
+  agent.yaml: "rclone: \n  config_secrets: [\"seldon-rclone-gs-public\"]"
 kind: ConfigMap
 metadata:
   name: seldon-agent
   namespace: seldon-mesh
 ---
 apiVersion: v1
+data:
+  kafka.json: |-
+    {
+       "bootstrap.servers": "seldon-kafka-plain-bootstrap.kafka:9092",
+       "consumer":{
+          "session.timeout.ms":6000,
+          "auto.offset.reset":"earliest"
+       },
+       "producer":{
+         "linger.ms":0,
+         "message.max.bytes":1000000000
+       },
+       "streams":{
+       }
+    }
+kind: ConfigMap
+metadata:
+  name: seldon-kafka
+  namespace: seldon-mesh
+---
+apiVersion: v1
 data:
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
@@ -704,6 +724,7 @@ spec:
         - --scheduler-port=9004
         - --envoy-host=seldon-mesh
         - --envoy-port=80
+        - --config-path=/mnt/config/kafka.json
         command:
         - /bin/modelgateway
         env:
@@ -726,7 +747,7 @@ spec:
       terminationGracePeriodSeconds: 5
       volumes:
       - configMap:
-          name: seldon-agent
+          name: seldon-kafka
         name: config-volume
 ---
 apiVersion: apps/v1
@@ -750,7 +771,7 @@ spec:
       - args:
         - --http-port=9010
         - --grpc-port=9011
-        - --config-path=/mnt/config
+        - --config-path=/mnt/config/kafka.json
         command:
         - /bin/pipelinegateway
         env:
@@ -780,7 +801,7 @@ spec:
       terminationGracePeriodSeconds: 5
       volumes:
       - configMap:
-          name: seldon-agent
+          name: seldon-kafka
         name: config-volume
 ---
 apiVersion: apps/v1

diff --git a/k8s/yaml/seldon-v2-crds.yaml b/k8s/yaml/seldon-v2-crds.yaml
diff --git a/operator/apis/mlops/v1alpha1/experiment_types.go b/operator/apis/mlops/v1alpha1/experiment_types.go
@@ -51,6 +51,7 @@ type ExperimentStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=mlx
 
 // Experiment is the Schema for the experiments API
 type Experiment struct {

diff --git a/operator/apis/mlops/v1alpha1/explainer_types.go b/operator/apis/mlops/v1alpha1/explainer_types.go
@@ -52,6 +52,7 @@ type ExplainerStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=mle
 
 // Explainer is the Schema for the explainers API
 type Explainer struct {

diff --git a/operator/apis/mlops/v1alpha1/model_types.go b/operator/apis/mlops/v1alpha1/model_types.go
@@ -95,6 +95,7 @@ type ModelStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=mlm
 
 // Model is the Schema for the models API
 type Model struct {

diff --git a/operator/apis/mlops/v1alpha1/pipeline_types.go b/operator/apis/mlops/v1alpha1/pipeline_types.go
@@ -78,6 +78,7 @@ type PipelineStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=mlp
 
 // Pipeline is the Schema for the pipelines API
 type Pipeline struct {

diff --git a/operator/apis/mlops/v1alpha1/server_types.go b/operator/apis/mlops/v1alpha1/server_types.go
@@ -70,6 +70,7 @@ type ServerStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=mls
 
 // Server is the Schema for the servers API
 type Server struct {

diff --git a/operator/apis/mlops/v1alpha1/serverconfig_types.go b/operator/apis/mlops/v1alpha1/serverconfig_types.go
@@ -51,6 +51,7 @@ type ServerConfigStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=mlc
 
 // ServerConfig is the Schema for the serverconfigs API
 type ServerConfig struct {

diff --git a/operator/config/crd/bases/mlops.seldon.io_experiments.yaml b/operator/config/crd/bases/mlops.seldon.io_experiments.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Experiment
     listKind: ExperimentList
     plural: experiments
+    shortNames:
+    - mlx
     singular: experiment
   scope: Namespaced
   versions:

diff --git a/operator/config/crd/bases/mlops.seldon.io_explainers.yaml b/operator/config/crd/bases/mlops.seldon.io_explainers.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Explainer
     listKind: ExplainerList
     plural: explainers
+    shortNames:
+    - mle
     singular: explainer
   scope: Namespaced
   versions:

diff --git a/operator/config/crd/bases/mlops.seldon.io_models.yaml b/operator/config/crd/bases/mlops.seldon.io_models.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Model
     listKind: ModelList
     plural: models
+    shortNames:
+    - mlm
     singular: model
   scope: Namespaced
   versions:

diff --git a/operator/config/crd/bases/mlops.seldon.io_pipelines.yaml b/operator/config/crd/bases/mlops.seldon.io_pipelines.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Pipeline
     listKind: PipelineList
     plural: pipelines
+    shortNames:
+    - mlp
     singular: pipeline
   scope: Namespaced
   versions:

diff --git a/operator/config/crd/bases/mlops.seldon.io_serverconfigs.yaml b/operator/config/crd/bases/mlops.seldon.io_serverconfigs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ServerConfig
     listKind: ServerConfigList
     plural: serverconfigs
+    shortNames:
+    - mlc
     singular: serverconfig
   scope: Namespaced
   versions:

diff --git a/operator/config/crd/bases/mlops.seldon.io_servers.yaml b/operator/config/crd/bases/mlops.seldon.io_servers.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Server
     listKind: ServerList
     plural: servers
+    shortNames:
+    - mls
     singular: server
   scope: Namespaced
   versions: