Change schema.yaml to v2 (#2009)

* pass pipeline runner service account to api server

* update schema

* fix

* change image

* Update schema.yaml

* Update values.yaml

* Update values.yaml

manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml

@@ -1,33 +1,33 @@
 images:
-  mysql: gcr.io/ml-pipeline/mysql:5.6
+  apiServer: gcr.io/ml-pipeline/api-server:0.1.27
+  argoExecutor: gcr.io/ml-pipeline/argoexec:v2.3.0
+  argoWorkflowController: gcr.io/ml-pipeline/workflow-controller:v2.3.0
   cloudsqlProxy: gcr.io/cloudsql-docker/gce-proxy:1.14
+  frontend: gcr.io/ml-pipeline/frontend:0.1.27
+  metadataServer: gcr.io/kubeflow-images-public/metadata:v0.1.8
   minio: gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z
-  apiServer: gcr.io/ml-pipeline/api-server:0.1.27
+  mysql: gcr.io/ml-pipeline/mysql:5.6
   persistenceagent: gcr.io/ml-pipeline/persistenceagent:0.1.27
+  proxyAgent: gcr.io/ml-pipeline/inverse-proxy-agent:0.1.27
   scheduledworkflow: gcr.io/ml-pipeline/scheduledworkflow:0.1.27
-  frontend: gcr.io/ml-pipeline/frontend:0.1.27
   viewerCrd: gcr.io/ml-pipeline/viewer-crd-controller:0.1.27
   visualizationServer: gcr.io/ml-pipeline/visualization-server:0.1.27
-  metadataServer: gcr.io/kubeflow-images-public/metadata:v0.1.8
-  proxyAgent: gcr.io/ml-pipeline/inverse-proxy-agent:0.1.27
-  argoExecutor: gcr.io/ml-pipeline/argoexec:v2.3.0
-  argoWorkflowController: gcr.io/ml-pipeline/workflow-controller:v2.3.0
 
 serviceAccount:
-  proxyAgentRunner: null
+  argo: null
+  mlPipeline: null
   mlPipelinePersistenceAgent: null
   mlPipelineScheduledWorkflow: null
   mlPipelineUI: null
   mlPipelineViewerCrd: null
-  mlPipeline: null
   pipelineRunner: null
-  argo: null
+  proxyAgentRunner: null
 
 managedstorage:
-  enabled: false
   cloudsqlInstanceName: null
   cloudsqlZone: null
+  databaseNamePrefix: null
   dbPassword: null
+  enabled: false
   gcpProject: null
   gcpSecretName: null
-  databaseNamePrefix: null

manifests/gcp_marketplace/deployer/Dockerfile

@@ -1 +1 @@
-FROM gcr.io/cloud-marketplace-tools/k8s/deployer_helm/onbuild
+FROM gcr.io/ml-pipeline/marketplace-k8s-app-tools/k8s/deployer_helm/onbuild:0829-pr396

manifests/gcp_marketplace/schema.yaml

@@ -1,4 +1,82 @@
-applicationApiVersion: v1beta1
+x-google-marketplace:
+  schemaVersion: v2
+  applicationApiVersion: v1beta1
+  publishedVersion: '0.1.27'
+  publishedVersionMetadata:
+    releaseNote: >-
+      Initial release.
+    releaseTypes:
+      - Feature
+    recommended: false
+  managedUpdates:
+    kalmSupported: false
+  images:
+    '':
+      properties:
+        imageRepo:
+          type: REPO_WITH_REGISTRY
+        imageTag:
+          type: TAG
+    mysql:
+      properties:
+        images.mysql:
+          type: FULL
+    minio:
+      properties:
+        images.minio:
+          type: FULL
+    argoExecutor:
+      properties:
+        images.argoExecutor:
+          type: FULL
+    argoWorkflowController:
+      properties:
+        images.argoWorkflowController:
+          type: FULL
+    apiServer:
+      properties:
+        images.apiServer:
+          type: FULL
+    persistenceagent:
+      properties:
+        images.persistenceagent:
+          type: FULL
+    scheduledworkflow:
+      properties:
+        images.scheduledworkflow:
+          type: FULL
+    frontend:
+      properties:
+        images.frontend:
+          type: FULL
+    viewerCrd:
+      properties:
+        images.viewerCrd:
+          type: FULL
+    visualizationServer:
+      properties:
+        images.visualizationServer:
+          type: FULL
+    metadataServer:
+      properties:
+        images.metadataServer:
+          type: FULL
+    proxyAgent:
+      properties:
+        images.proxyAgent:
+          type: FULL
+    cloudsqlProxy:
+      properties:
+        images.cloudsqlProxy:
+          type: FULL
+  deployerServiceAccount:
+    roles:
+      - type: ClusterRole        # This is a cluster-wide ClusterRole
+        rulesType: CUSTOM        # We specify our own custom RBAC roles
+        rules:
+          - apiGroups: ['apiextensions.k8s.io']
+            resources: ['customresourcedefinitions']
+            verbs: ['*']
 
 properties:
   name:
@@ -9,71 +87,26 @@ properties:
     type: string
     x-google-marketplace:
       type: NAMESPACE
-#  image.mysql:
-#    type: string
-#    default: $REGISTRY/mysql:5.6
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.minio:
-#    type: string
-#    default: $REGISTRY/minio:RELEASE.2018-02-09T22-40-05Z
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.argoExecutor:
-#    type: string
-#    default: $REGISTRY/argoexec:v2.3.0
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.argoWorkflowController:
-#    type: string
-#    default: $REGISTRY/workflow-controller:v2.3.0
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.apiServer:
-#    type: string
-#    default: $REGISTRY/api-server:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.persistenceagent:
-#    type: string
-#    default: $REGISTRY/persistenceagent:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.scheduledworkflow:
-#    type: string
-#    default: $REGISTRY/scheduledworkflow:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.frontend:
-#    type: string
-#    default: $REGISTRY/frontend:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.viewerCrd:
-#    type: string
-#    default: $REGISTRY/viewer-crd-controller:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.visualizationServer:
-#    type: string
-#    default: $REGISTRY/visualization-server:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.metadataServer:
-#    type: string
-#    default: gcr.io/kubeflow-images-public/metadata:v0.1.8
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.proxyAgent:
-#    type: string
-#    default: $REGISTRY/inverse-proxy-agent:$TAG
-#    x-google-marketplace:
-#      type: IMAGE
-#  image.cloudsqlProxy:
-#    type: string
-#    default: gcr.io/cloudsql-docker/gce-proxy:1.14
-#    x-google-marketplace:
-#      type: IMAGE
+  managedstorage.enabled:
+    type: boolean
+    title: Enable managed storage
+    description: Use Cloud SQL and GCS for storing the data
+    default: false
+  managedstorage.cloudsqlInstanceName:
+    type: string
+    title: CloudSQL instance name
+  managedstorage.cloudsqlZone:
+    type: string
+    title: CloudSQL zone
+  managedstorage.dbPassword:
+    type: string
+    title: database password
+  managedstorage.gcpProject:
+    type: string
+    title: GCP project
+  managedstorage.databaseNamePrefix:
+    type: string
+    title: database name prefix
   serviceAccount.proxyAgentRunner:
     type: string
     title: ProxyAgentRunnerServiceAccount
@@ -385,16 +418,3 @@ properties:
 required:
   - name
   - namespace
-
-x-google-marketplace:
-  deployerServiceAccount:
-    roles:
-      - type: ClusterRole        # This is a cluster-wide ClusterRole
-        rulesType: CUSTOM        # We specify our own custom RBAC roles
-        rules:
-          - apiGroups: ['apiextensions.k8s.io']
-            resources: ['customresourcedefinitions']
-            verbs: ['*']
-      - type: Role               # This is a namespaced Role
-        rulesType: PREDEFINED
-        rulesFromRoleName: edit  # Use predefined role named "edit"