Merge pull request #782 from ryandawsonuk/749-credsassecret

crd changes for creds secret
SeldonIO · Aug 12, 2019 · 4726648 · 4726648
2 parents d55064d + 430c6ce
commit 4726648
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/helm-charts/seldon-core-operator/templates/crd.yaml b/helm-charts/seldon-core-operator/templates/crd.yaml
@@ -1952,6 +1952,7 @@ spec:
                           type:
                             enum: [REST, GRPC]
                             type: string
+                      envSecretRefName: {type: string}
                       modelUri: {type: string}
                       serviceAccountName: {type: string}
                       type: {type: string}
@@ -1974,6 +1975,7 @@ spec:
                                       type:
                                         enum: [REST, GRPC]
                                         type: string
+                                  envSecretRefName: {type: string}
                                   implementation:
                                     enum: [UNKNOWN_IMPLEMENTATION, SIMPLE_MODEL, SIMPLE_ROUTER,
                                            RANDOM_ABTEST, AVERAGE_COMBINER, SKLEARN_SERVER,

diff --git a/proto/seldon_deployment.proto b/proto/seldon_deployment.proto
@@ -46,7 +46,8 @@ message Explainer {
   optional string type = 1; // Type of explainer
   optional string modelUri = 2; // Bucket or PVC location of explainer model
   optional string serviceAccountName = 3; // Service account for pulling from bucket
-  optional k8s.io.api.core.v1.Container containerSpec = 4; // Custom spec for explainer
+  optional string envSecretRefName = 4; // Secret for pulling from bucket
+  optional k8s.io.api.core.v1.Container containerSpec = 5; // Custom spec for explainer
 }
 
 message PredictorSpec {
@@ -128,6 +129,7 @@ message PredictiveUnit {
   repeated Parameter parameters = 7; // Customer parameter to pass to the unit.
   optional string modelUri = 8; // Location of saved model
   optional string serviceAccountName = 9; // Service account for pulling model bucket
+  optional string envSecretRefName = 10; // Secret for pulling from bucket
 }
 
 message Endpoint {

diff --git a/util/custom-resource-definitions/crd.tpl.json b/util/custom-resource-definitions/crd.tpl.json
@@ -79,6 +79,9 @@
 									"serviceAccountName": {
 										"type": "string"
 									},
+									"envSecretRefName": {
+										"type": "string"
+									},
 									"implementation": {
 									    "enum": [
 										"UNKNOWN_IMPLEMENTATION",
@@ -293,6 +296,9 @@
 							"serviceAccountName": {
 								"type": "string"
 							},
+							"envSecretRefName": {
+								"type": "string"
+							},
 							"type": {
 								"type": "string"
 							},