Update to Kubeflow v1.1

kfctl_k8s_istio.yaml

@@ -57,6 +57,11 @@ spec:
         name: manifests
         path: istio/istio
     name: istio
+  - kustomizeConfig:
+      repoRef:
+        name: manifests
+        path: metacontroller
+    name: metacontroller
   - kustomizeConfig:
       overlays:
       - istio
@@ -83,7 +88,13 @@ spec:
     name: centraldashboard
   - kustomizeConfig:
       overlays:
-      - cert-manager
+      - application
+      repoRef:
+        name: manifests
+        path: admission-webhook/bootstrap
+    name: bootstrap
+  - kustomizeConfig:
+      overlays:
       - application
       repoRef:
         name: manifests
@@ -310,5 +321,5 @@ spec:
     name: seldon-core-operator
   repos:
   - name: manifests
-    uri: https://github.com/kubeflow/manifests/archive/v1.0.2.tar.gz
-  version: v1.0.2
+    uri: https://github.com/kubeflow/manifests/archive/v1.1.0.tar.gz
+  version: v1.1.0

kustomize/api-service/base/config-map.yaml

@@ -8,12 +8,14 @@ data:
       "DBConfig": {
         "DriverName": "mysql",
         "DataSourceName": "",
-        "DBName": "mlpipeline"
+        "DBName": "mlpipeline",
+        "GroupConcatMaxLen": "4194304"
       },
       "ObjectStoreConfig":{
         "AccessKey": "minio",
         "SecretAccessKey": "minio123",
-        "BucketName": "mlpipeline"
+        "BucketName": "mlpipeline",
+        "Secure": false
       },
       "InitConnectionTimeout": "6m",
       "DefaultPipelineRunnerServiceAccount": "pipeline-runner",

kustomize/api-service/base/deployment.yaml

@@ -4,6 +4,9 @@ metadata:
   name: ml-pipeline
 spec:
   template:
+    metadata:
+      annotations:
+        sidecar.istio.io/inject: "false"
     spec:
       containers:
       - name: ml-pipeline-api-server
@@ -15,17 +18,17 @@ spec:
         image: gcr.io/ml-pipeline/api-server
         imagePullPolicy: IfNotPresent
         command:
-          - apiserver 
+          - apiserver
           - --config=/etc/ml-pipeline-config
-          - --sampleconfig=/config/sample_config.json 
+          - --sampleconfig=/config/sample_config.json
           - -logtostderr=true
         ports:
         - containerPort: 8888
         - containerPort: 8887
         volumeMounts:
         - name: config-volume
           mountPath: /etc/ml-pipeline-config
-      serviceAccountName: ml-pipeline      
+      serviceAccountName: ml-pipeline
       volumes:
         - name: config-volume
           configMap:

kustomize/api-service/kustomization.yaml

@@ -3,11 +3,7 @@ bases:
 - base
 commonLabels:
   app.kubernetes.io/component: api-service
-  app.kubernetes.io/instance: api-service-0.2.5
-  app.kubernetes.io/managed-by: kfctl
   app.kubernetes.io/name: api-service
-  app.kubernetes.io/part-of: kubeflow
-  app.kubernetes.io/version: 0.2.5
 kind: Kustomization
 namespace: kubeflow
 resources:

kustomize/api-service/overlays/application/kustomization.yaml

@@ -3,11 +3,7 @@ bases:
 - ../../base
 commonLabels:
   app.kubernetes.io/component: api-service
-  app.kubernetes.io/instance: api-service-0.2.5
-  app.kubernetes.io/managed-by: kfctl
   app.kubernetes.io/name: api-service
-  app.kubernetes.io/part-of: kubeflow
-  app.kubernetes.io/version: 0.2.5
 kind: Kustomization
 resources:
 - application.yaml

kustomize/api-service/overlays/external-mysql/kustomization.yaml

@@ -6,7 +6,8 @@ patchesStrategicMerge:
 - config-map.yaml
 configMapGenerator:
 - name: pipeline-external-mysql-parameters
-  env: params.env
+  envs:
+  - params.env
 generatorOptions:
   disableNameSuffixHash: true
 vars:

kustomize/application-crds/base/crd.yaml

@@ -231,9 +231,3 @@ spec:
               type: integer
           type: object
   version: v1beta1
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

kustomize/application/base/kustomization.yaml

@@ -10,7 +10,8 @@ namespace: kubeflow
 nameprefix: application-controller-
 configMapGenerator:
 - name: parameters
-  env: params.env
+  envs:
+  - params.env
 generatorOptions:
   disableNameSuffixHash: true
 images:

kustomize/application/base/stateful-set.yaml

@@ -21,6 +21,8 @@ spec:
         image: gcr.io/kubeflow-images-public/kubernetes-sigs/application
         imagePullPolicy: Always
         env:
+        # TODO(https://github.com/kubeflow/manifests/issues/1043)
+        # Do we really need this?
         - name: project
           value: $(project)
       serviceAccountName: service-account

kustomize/application/kustomization.yaml

@@ -3,11 +3,7 @@ bases:
 - base
 commonLabels:
   app.kubernetes.io/component: kubeflow
-  app.kubernetes.io/instance: kubeflow-v1.0.0
-  app.kubernetes.io/managed-by: kfctl
   app.kubernetes.io/name: kubeflow
-  app.kubernetes.io/part-of: kubeflow
-  app.kubernetes.io/version: v1.0.0
 kind: Kustomization
 namespace: kubeflow
 resources:

kustomize/application/overlays/application/application.yaml

@@ -6,11 +6,11 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: kubeflow
-      app.kubernetes.io/instance: kubeflow-v1.0.0
+      app.kubernetes.io/instance: kubeflow-v0.7.0
       app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/component: kubeflow
       app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v1.0.0
+      app.kubernetes.io/version: v0.7.0
   componentKinds:
     - group: app.k8s.io
       kind: Application

kustomize/application/overlays/application/kustomization.yaml

@@ -1,13 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
 bases:
 - ../../base
-resources:
-- application.yaml
 commonLabels:
-  app.kubernetes.io/name: kubeflow
-  app.kubernetes.io/instance: kubeflow-v1.0.0
-  app.kubernetes.io/managed-by: kfctl
   app.kubernetes.io/component: kubeflow
-  app.kubernetes.io/part-of: kubeflow
-  app.kubernetes.io/version: v1.0.0
+  app.kubernetes.io/name: kubeflow
+kind: Kustomization
+resources:
+- application.yaml

kustomize/argo/base/cluster-role.yaml

@@ -45,6 +45,12 @@ rules:
   - watch
   - update
   - patch
+- apiGroups:
+  - sparkoperator.k8s.io
+  resources:
+  - sparkapplications
+  verbs:
+  - '*'
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole

kustomize/argo/base/kustomization.yaml

@@ -19,7 +19,8 @@ images:
   newTag: v2.3.0
 configMapGenerator:
 - name: workflow-controller-parameters
-  env: params.env
+  envs:
+  - params.env
 generatorOptions:
   disableNameSuffixHash: true
 vars:

kustomize/argo/base/service.yaml

@@ -1,14 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    getambassador.io/config: |-
-      ---
-      apiVersion: ambassador/v0
-      kind:  Mapping
-      name: argo-ui-mapping
-      prefix: /argo/
-      service: argo-ui.$(namespace)
   labels:
     app: argo-ui
   name: argo-ui
@@ -20,4 +12,4 @@ spec:
   selector:
     app: argo-ui
   sessionAffinity: None
-  type: ClusterIP     
+  type: ClusterIP

kustomize/argo/base_v3/kustomization.yaml

@@ -0,0 +1,102 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../base/cluster-role-binding.yaml
+- ../base/cluster-role.yaml
+- ../base/config-map.yaml
+- ../base/crd.yaml
+- ../base/deployment.yaml
+- ../base/service-account.yaml
+- ../base/service.yaml
+- ../overlays/istio/virtual-service.yaml
+- ../overlays/application/application.yaml
+commonLabels:
+  kustomize.component: argo
+  app.kubernetes.io/component: argo
+  app.kubernetes.io/name: argo
+images:
+- name: argoproj/argoui
+  newName: argoproj/argoui
+  newTag: v2.3.0
+- name: argoproj/workflow-controller
+  newName: argoproj/workflow-controller
+  newTag: v2.3.0
+configMapGenerator:
+- name: workflow-controller-parameters
+  envs:
+  - ../base/params.env
+generatorOptions:
+  disableNameSuffixHash: true
+vars:
+- name: executorImage
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.executorImage
+- name: containerRuntimeExecutor
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.containerRuntimeExecutor
+- name: artifactRepositoryBucket
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositoryBucket
+- name: artifactRepositoryKeyPrefix
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositoryKeyPrefix
+- name: artifactRepositoryEndpoint
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositoryEndpoint
+- name: artifactRepositoryInsecure
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositoryInsecure
+- name: artifactRepositoryAccessKeySecretName
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositoryAccessKeySecretName
+- name: artifactRepositoryAccessKeySecretKey
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositoryAccessKeySecretKey
+- name: artifactRepositorySecretKeySecretName
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositorySecretKeySecretName
+- name: artifactRepositorySecretKeySecretKey
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.artifactRepositorySecretKeySecretKey
+configurations:
+- params.yaml

kustomize/argo/base_v3/params.yaml

@@ -0,0 +1,5 @@
+varReference:
+- path: data/config
+  kind: ConfigMap
+- path: spec/http/route/destination/host
+  kind: VirtualService

kustomize/argo/kustomization.yaml

@@ -3,11 +3,7 @@ bases:
 - base
 commonLabels:
   app.kubernetes.io/component: argo
-  app.kubernetes.io/instance: argo-v2.3.0
-  app.kubernetes.io/managed-by: kfctl
   app.kubernetes.io/name: argo
-  app.kubernetes.io/part-of: kubeflow
-  app.kubernetes.io/version: v2.3.0
 configurations:
 - overlays/istio/params.yaml
 kind: Kustomization

kustomize/argo/overlays/application/application.yaml

@@ -6,11 +6,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: argo
-      app.kubernetes.io/instance: argo-v2.3.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/component: argo
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v2.3.0
   componentKinds:
   - group: core
     kind: ConfigMap

kustomize/argo/overlays/application/kustomization.yaml

@@ -1,13 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
 bases:
 - ../../base
-resources:
-- application.yaml
 commonLabels:
-  app.kubernetes.io/name: argo
-  app.kubernetes.io/instance: argo-v2.3.0
-  app.kubernetes.io/managed-by: kfctl
   app.kubernetes.io/component: argo
-  app.kubernetes.io/part-of: kubeflow
-  app.kubernetes.io/version: v2.3.0
+  app.kubernetes.io/name: argo
+kind: Kustomization
+resources:
+- application.yaml

kustomize/bootstrap/base/cluster-role-binding.yaml

@@ -0,0 +1,11 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: cluster-role-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-role
+subjects:
+- kind: ServiceAccount
+  name: service-account