diff --git a/kubeflow/helm/pipelines/crds/argo_workflow_customresourcedefinition.yaml b/kubeflow/helm/pipelines/crds/argo_workflow_customresourcedefinition.yaml index 6d60ba61b..7df515f63 100644 --- a/kubeflow/helm/pipelines/crds/argo_workflow_customresourcedefinition.yaml +++ b/kubeflow/helm/pipelines/crds/argo_workflow_customresourcedefinition.yaml @@ -1,8 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - labels: - application-crd-id: kubeflow-pipelines name: clusterworkflowtemplates.argoproj.io spec: group: argoproj.io @@ -40,8 +38,6 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - labels: - application-crd-id: kubeflow-pipelines name: cronworkflows.argoproj.io spec: group: argoproj.io @@ -83,8 +79,6 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - labels: - application-crd-id: kubeflow-pipelines name: workfloweventbindings.argoproj.io spec: group: argoproj.io @@ -121,8 +115,6 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - labels: - application-crd-id: kubeflow-pipelines name: workflows.argoproj.io spec: group: argoproj.io @@ -174,18 +166,14 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - labels: - application-crd-id: kubeflow-pipelines - name: workflowtemplates.argoproj.io + name: workflowtaskresults.argoproj.io spec: group: argoproj.io names: - kind: WorkflowTemplate - listKind: WorkflowTemplateList - plural: workflowtemplates - shortNames: - - wftmpl - singular: workflowtemplate + kind: WorkflowTaskResult + listKind: WorkflowTaskResultList + plural: workflowtaskresults + singular: workflowtaskresult scope: Namespaced versions: - name: v1alpha1 @@ -196,15 +184,407 @@ spec: type: string kind: type: string + message: + type: string metadata: type: object - spec: + outputs: + properties: + artifacts: + items: + properties: + archive: + properties: + none: + type: object + tar: + properties: + compressionLevel: + format: int32 + type: integer + type: object + zip: + type: object + type: object + archiveLogs: + type: boolean + artifactory: + properties: + passwordSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + url: + type: string + usernameSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + required: + - url + type: object + from: + type: string + fromExpression: + type: string + gcs: + properties: + bucket: + type: string + key: + type: string + serviceAccountKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + required: + - key + type: object + git: + properties: + depth: + format: int64 + type: integer + disableSubmodules: + type: boolean + fetch: + items: + type: string + type: array + insecureIgnoreHostKey: + type: boolean + passwordSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + repo: + type: string + revision: + type: string + sshPrivateKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + usernameSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + required: + - repo + type: object + globalName: + type: string + hdfs: + properties: + addresses: + items: + type: string + type: array + force: + type: boolean + hdfsUser: + type: string + krbCCacheSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + krbConfigConfigMap: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + krbKeytabSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + krbRealm: + type: string + krbServicePrincipalName: + type: string + krbUsername: + type: string + path: + type: string + required: + - path + type: object + http: + properties: + headers: + items: + properties: + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + url: + type: string + required: + - url + type: object + mode: + format: int32 + type: integer + name: + type: string + optional: + type: boolean + oss: + properties: + accessKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + bucket: + type: string + createBucketIfNotPresent: + type: boolean + endpoint: + type: string + key: + type: string + lifecycleRule: + properties: + markDeletionAfterDays: + format: int32 + type: integer + markInfrequentAccessAfterDays: + format: int32 + type: integer + type: object + secretKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + securityToken: + type: string + required: + - key + type: object + path: + type: string + raw: + properties: + data: + type: string + required: + - data + type: object + recurseMode: + type: boolean + s3: + properties: + accessKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + bucket: + type: string + createBucketIfNotPresent: + properties: + objectLocking: + type: boolean + type: object + encryptionOptions: + properties: + enableEncryption: + type: boolean + kmsEncryptionContext: + type: string + kmsKeyId: + type: string + serverSideCustomerKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + endpoint: + type: string + insecure: + type: boolean + key: + type: string + region: + type: string + roleARN: + type: string + secretKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + useSDKCreds: + type: boolean + type: object + subPath: + type: string + required: + - name + type: object + type: array + exitCode: + type: string + parameters: + items: + properties: + default: + type: string + description: + type: string + enum: + items: + type: string + type: array + globalName: + type: string + name: + type: string + value: + type: string + valueFrom: + properties: + configMapKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + default: + type: string + event: + type: string + expression: + type: string + jqFilter: + type: string + jsonPath: + type: string + parameter: + type: string + path: + type: string + supplied: + type: object + type: object + required: + - name + type: object + type: array + result: + type: string type: object - x-kubernetes-map-type: atomic - x-kubernetes-preserve-unknown-fields: true + phase: + type: string + progress: + type: string required: - metadata - - spec type: object served: true storage: true @@ -248,3 +628,41 @@ spec: type: object served: true storage: true + subresources: + status: {} +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: workflowtemplates.argoproj.io +spec: + group: argoproj.io + names: + kind: WorkflowTemplate + listKind: WorkflowTemplateList + plural: workflowtemplates + shortNames: + - wftmpl + singular: workflowtemplate + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + x-kubernetes-map-type: atomic + x-kubernetes-preserve-unknown-fields: true + required: + - metadata + - spec + type: object + served: true + storage: true diff --git a/kubeflow/helm/pipelines/templates/api-server/clusterrole.yaml b/kubeflow/helm/pipelines/templates/api-server/clusterrole.yaml index f059a0ec8..26114c224 100644 --- a/kubeflow/helm/pipelines/templates/api-server/clusterrole.yaml +++ b/kubeflow/helm/pipelines/templates/api-server/clusterrole.yaml @@ -110,6 +110,8 @@ rules: - retry - terminate - unarchive + - reportMetrics + - readArtifact - apiGroups: - pipelines.kubeflow.org resources: @@ -150,11 +152,18 @@ rules: - pipelines - pipelines/versions - experiments - - runs - jobs verbs: - get - list + - apiGroups: + - pipelines.kubeflow.org + resources: + - runs + verbs: + - get + - list + - readArtifact - apiGroups: - kubeflow.org resources: diff --git a/kubeflow/helm/pipelines/templates/argo-workflow-controller/clusterrole.yaml b/kubeflow/helm/pipelines/templates/argo-workflow-controller/clusterrole.yaml index 6b42c0563..b229b0a16 100644 --- a/kubeflow/helm/pipelines/templates/argo-workflow-controller/clusterrole.yaml +++ b/kubeflow/helm/pipelines/templates/argo-workflow-controller/clusterrole.yaml @@ -29,8 +29,10 @@ rules: - "" resources: - persistentvolumeclaims + - persistentvolumeclaims/finalizers verbs: - create + - update - delete - get - apiGroups: @@ -59,6 +61,14 @@ rules: - get - list - watch + - apiGroups: + - argoproj.io + resources: + - workflowtaskresults + verbs: + - list + - watch + - deletecollection - apiGroups: - "" resources: diff --git a/kubeflow/helm/pipelines/templates/argo-workflow-controller/configmap.yaml b/kubeflow/helm/pipelines/templates/argo-workflow-controller/configmap.yaml index 303fc5bc5..ffd9ae09b 100644 --- a/kubeflow/helm/pipelines/templates/argo-workflow-controller/configmap.yaml +++ b/kubeflow/helm/pipelines/templates/argo-workflow-controller/configmap.yaml @@ -1,9 +1,9 @@ apiVersion: v1 data: - containerRuntimeExecutor: pns + containerRuntimeExecutor: emissary # TODO: don't hardcode this executor: | imagePullPolicy: IfNotPresent - resources: + resources: # TODO: don't hardcode this. Upstream this is removed for some reason. requests: cpu: 0.01 memory: 32Mi diff --git a/kubeflow/helm/pipelines/templates/persistence-agent/clusterrole.yaml b/kubeflow/helm/pipelines/templates/persistence-agent/clusterrole.yaml index dba497147..e35e79921 100644 --- a/kubeflow/helm/pipelines/templates/persistence-agent/clusterrole.yaml +++ b/kubeflow/helm/pipelines/templates/persistence-agent/clusterrole.yaml @@ -20,3 +20,16 @@ rules: - get - list - watch + - apiGroups: + - pipelines.kubeflow.org + resources: + - scheduledworkflows + - workflows + verbs: + - report + - apiGroups: + - "" + resources: + - namespaces + verbs: + - get diff --git a/kubeflow/helm/pipelines/templates/persistence-agent/role.yaml b/kubeflow/helm/pipelines/templates/persistence-agent/role.yaml index b782cbc08..406247837 100644 --- a/kubeflow/helm/pipelines/templates/persistence-agent/role.yaml +++ b/kubeflow/helm/pipelines/templates/persistence-agent/role.yaml @@ -4,19 +4,32 @@ metadata: labels: {{- include "pipelines.labels" . | nindent 4 }} name: {{ include "pipelines.fullname" . }}-persistence-agent-role rules: - - apiGroups: - - argoproj.io - resources: - - workflows - verbs: - - get - - list - - watch - - apiGroups: - - kubeflow.org - resources: - - scheduledworkflows - verbs: - - get - - list - - watch +- apiGroups: + - argoproj.io + resources: + - workflows + verbs: + - get + - list + - watch +- apiGroups: + - kubeflow.org + resources: + - scheduledworkflows + verbs: + - get + - list + - watch +- apiGroups: + - pipelines.kubeflow.org + resources: + - scheduledworkflows + - workflows + verbs: + - report +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get diff --git a/kubeflow/helm/pipelines/templates/viewer-controller/deployment.yaml b/kubeflow/helm/pipelines/templates/viewer-controller/deployment.yaml index 694434926..84049d8b6 100644 --- a/kubeflow/helm/pipelines/templates/viewer-controller/deployment.yaml +++ b/kubeflow/helm/pipelines/templates/viewer-controller/deployment.yaml @@ -39,10 +39,6 @@ spec: value: "" - name: MAX_NUM_VIEWERS value: "50" - - name: MINIO_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }}