Use upper case for ks parameter (#328)

* [WIP] change deployment platform to gcp * debug * revert test * use upper case for ks parameter * Update deploy.sh * Update presubmit-tests.sh * Use ks env for pipeline namespace (#326) * [WIP] change deployment platform to gcp * debug * revert test * use env for namespace * set ns correctly * Update presubmit-tests.sh * revert
kubeflow · Nov 20, 2018 · 1bec4fe · 1bec4fe
1 parent dd0bd45
commit 1bec4fe
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/ml-pipeline/deploy.sh b/ml-pipeline/deploy.sh
@@ -154,12 +154,12 @@ fi
 # Generate a ksonnet component manifest and assign parameters
 ( cd ${APP_DIR} && ks generate ml-pipeline ml-pipeline )
 ( cd ${APP_DIR} && ks env set default --namespace ${NAMESPACE} )
-( cd ${APP_DIR} && ks param set ml-pipeline api_image ${API_SERVER_IMAGE} )
-( cd ${APP_DIR} && ks param set ml-pipeline scheduledworkflow_image ${SCHEDULED_WORKFLOW_IMAGE} )
-( cd ${APP_DIR} && ks param set ml-pipeline persistenceagent_image ${PERSISTENCE_AGENT_IMAGE} )
-( cd ${APP_DIR} && ks param set ml-pipeline ui_image ${UI_IMAGE} )
-( cd ${APP_DIR} && ks param set ml-pipeline deploy_argo ${DEPLOY_ARGO} )
-( cd ${APP_DIR} && ks param set ml-pipeline report_usage ${REPORT_USAGE} )
+( cd ${APP_DIR} && ks param set ml-pipeline apiImage ${API_SERVER_IMAGE} )
+( cd ${APP_DIR} && ks param set ml-pipeline scheduledWorkflowImage ${SCHEDULED_WORKFLOW_IMAGE} )
+( cd ${APP_DIR} && ks param set ml-pipeline persistenceAgentImage ${PERSISTENCE_AGENT_IMAGE} )
+( cd ${APP_DIR} && ks param set ml-pipeline uiImage ${UI_IMAGE} )
+( cd ${APP_DIR} && ks param set ml-pipeline deployArgo ${DEPLOY_ARGO} )
+( cd ${APP_DIR} && ks param set ml-pipeline reportUsage ${REPORT_USAGE} )
 ( cd ${APP_DIR} && ks param set ml-pipeline usage_id $(uuidgen) )
 
 # Get current active service account and create a user-gcp-sa secret with the service key

diff --git a/ml-pipeline/ml-pipeline/all.libsonnet b/ml-pipeline/ml-pipeline/all.libsonnet
@@ -13,25 +13,25 @@
 
     local name = params.name,
     local namespace = params.namespace,
-    local api_image = params.api_image,
-    local scheduledworkflow_image = params.scheduledworkflow_image,
-    local persistenceagent_image = params.persistenceagent_image,
-    local ui_image = params.ui_image,
-    local deploy_argo = params.deploy_argo,
-    local report_usage = params.report_usage,
+    local apiImage = params.apiImage,
+    local scheduledWorkflowImage = params.scheduledWorkflowImage,
+    local persistenceAgentImage = params.persistenceAgentImage,
+    local uiImage = params.uiImage,
+    local deployArgo = params.deployArgo,
+    local reportUsage = params.reportUsage,
     local usage_id = params.usage_id,
-    reporting:: if (report_usage == true) || (report_usage == "true") then
+    reporting:: if (reportUsage == true) || (reportUsage == "true") then
                   spartakus.all(namespace,usage_id)
                 else [],
-    argo:: if (deploy_argo == true) || (deploy_argo == "true") then
+    argo:: if (deployArgo == true) || (deployArgo == "true") then
              argo.parts(namespace).all
            else [],
     all:: minio.parts(namespace).all +
           mysql.parts(namespace).all +
-          pipeline_apiserver.all(namespace,api_image) +
-          pipeline_scheduledworkflow.all(namespace,scheduledworkflow_image) +
-          pipeline_persistenceagent.all(namespace,persistenceagent_image) +
-          pipeline_ui.all(namespace,ui_image) +
+          pipeline_apiserver.all(namespace,apiImage) +
+          pipeline_scheduledworkflow.all(namespace,scheduledWorkflowImage) +
+          pipeline_persistenceagent.all(namespace,persistenceAgentImage) +
+          pipeline_ui.all(namespace,uiImage) +
           $.parts(_env, _params).argo +
           $.parts(_env, _params).reporting,
   },

diff --git a/ml-pipeline/ml-pipeline/pipeline-apiserver.libsonnet b/ml-pipeline/ml-pipeline/pipeline-apiserver.libsonnet
@@ -1,10 +1,10 @@
 {
-  all(namespace, api_image):: [
+  all(namespace, apiImage):: [
     $.parts(namespace).serviceAccount,
     $.parts(namespace).roleBinding,
     $.parts(namespace).role,
     $.parts(namespace).service,
-    $.parts(namespace).deploy(api_image),
+    $.parts(namespace).deploy(apiImage),
     $.parts(namespace).pipelineRunnerServiceAccount,
     $.parts(namespace).pipelineRunnerRole,
     $.parts(namespace).pipelineRunnerRoleBinding,

diff --git a/ml-pipeline/ml-pipeline/pipeline-persistenceagent.libsonnet b/ml-pipeline/ml-pipeline/pipeline-persistenceagent.libsonnet
@@ -1,9 +1,9 @@
 {
-  all(namespace, persistenceagent_image):: [
+  all(namespace, persistenceAgentImage):: [
     $.parts(namespace).serviceAccount,
     $.parts(namespace).roleBinding,
     $.parts(namespace).role,
-    $.parts(namespace).deploy(persistenceagent_image),
+    $.parts(namespace).deploy(persistenceAgentImage),
   ],
 
   parts(namespace):: {

diff --git a/ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet b/ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet
@@ -1,9 +1,9 @@
 {
-  all(namespace, scheduledworkflow_image):: [
+  all(namespace, scheduledWorkflowImage):: [
     $.parts(namespace).serviceAccount,
     $.parts(namespace).roleBinding,
     $.parts(namespace).role,
-    $.parts(namespace).deploy(scheduledworkflow_image),
+    $.parts(namespace).deploy(scheduledWorkflowImage),
     $.parts(namespace).crd,
   ],
 

diff --git a/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet b/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet
@@ -1,11 +1,11 @@
 {
-  all(namespace, ui_image):: [
+  all(namespace, uiImage):: [
     $.parts(namespace).serviceAccount,
     $.parts(namespace).serviceUi,
     $.parts(namespace).tensorboardData,
     $.parts(namespace).roleBinding,
     $.parts(namespace).role,
-    $.parts(namespace).deployUi(ui_image),
+    $.parts(namespace).deployUi(uiImage),
   ],
   parts(namespace):: {
     serviceAccount: {

diff --git a/ml-pipeline/ml-pipeline/prototypes/ml-pipeline.jsonnet b/ml-pipeline/ml-pipeline/prototypes/ml-pipeline.jsonnet
@@ -3,12 +3,12 @@
 // @description ML pipeline. Currently includes pipeline API server, frontend and dependencies.
 // @shortDescription ML pipeline
 // @param name string Name to give to each of the components
-// @optionalParam api_image string gcr.io/ml-pipeline/api-server:0.1.2 API docker image
-// @optionalParam scheduledworkflow_image string gcr.io/ml-pipeline/scheduledworkflow:0.1.2 schedule workflow docker image
-// @optionalParam persistenceagent_image string gcr.io/ml-pipeline/persistenceagent:0.1.2 persistence agent docker image
-// @optionalParam ui_image string gcr.io/ml-pipeline/frontend:0.1.2 UI docker image
-// @optionalParam deploy_argo string false flag to deploy argo
-// @optionalParam report_usage string false flag to report usage
+// @optionalParam apiImage string gcr.io/ml-pipeline/api-server:0.1.2 API docker image
+// @optionalParam scheduledWorkflowImage string gcr.io/ml-pipeline/scheduledworkflow:0.1.2 schedule workflow docker image
+// @optionalParam persistenceAgentImage string gcr.io/ml-pipeline/persistenceagent:0.1.2 persistence agent docker image
+// @optionalParam uiImage string gcr.io/ml-pipeline/frontend:0.1.2 UI docker image
+// @optionalParam deployArgo string false flag to deploy argo
+// @optionalParam reportUsage string false flag to report usage
 
 local k = import "k.libsonnet";
 local all = import "ml-pipeline/ml-pipeline/all.libsonnet";