Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
95 changes: 95 additions & 0 deletions kfdef/kfctl_ibm.v1.1.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
apiVersion: kfdef.apps.kubeflow.org/v1

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the release process now? Does vendor create v1.1.0 yaml by their own?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hope the 1.1.0 version will be created when the v1.1.0 release is finally out. Since this multi-user may not make to v1.1.0 release, I will remove this version of kfdef.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adrian555 multi-user should be part of v1.1.0 release

kind: KfDef
metadata:
namespace: kubeflow
spec:
applications:
# Install istio in a different namespace: istio-system
# Remove this application if istio is already installed
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/istio-stack
name: istio-stack
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cluster-local-gateway
name: cluster-local-gateway
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/istio
name: istio
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/add-anonymous-user-filter
name: add-anonymous-user-filter
- kustomizeConfig:
repoRef:
name: manifests
path: application/v3
name: application
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/bootstrap
name: bootstrap
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cert-manager-crds
name: cert-manager-crds
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cert-manager-kube-system-resources
name: cert-manager-kube-system-resources
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cert-manager
name: cert-manager
# Install Kubeflow applications.
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm
name: kubeflow-apps
- kustomizeConfig:
repoRef:
name: manifests
path: metacontroller/base
name: metacontroller
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/spark-operator
name: spark-operator
- kustomizeConfig:
repoRef:
name: manifests
path: knative/installs/generic
name: knative
- kustomizeConfig:
repoRef:
name: manifests
path: kfserving/installs/generic
name: kfserving
# Spartakus is a separate applications so that kfctl can remove it
# to disable usage reporting
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/spartakus
name: spartakus
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/tensorboard
name: tensorboard
repos:
- name: manifests
uri: https://github.com/kubeflow/manifests/archive/v1.1.0.tar.gz
version: v1.1.0
5 changes: 0 additions & 5 deletions kfdef/kfctl_ibm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ spec:
name: manifests
path: metacontroller/base
name: metacontroller
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/metadata
name: metadata
- kustomizeConfig:
repoRef:
name: manifests
Expand Down
103 changes: 103 additions & 0 deletions kfdef/kfctl_ibm_dex_multi_user.v1.1.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
apiVersion: kfdef.apps.kubeflow.org/v1
kind: KfDef
metadata:
namespace: kubeflow
spec:
applications:
- kustomizeConfig:
repoRef:
name: manifests
path: namespaces/base
name: namespaces
# Install istio in a different namespace: istio-system
# Remove this application if istio is already installed
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/istio-1-3-1-stack
name: istio-stack
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cluster-local-gateway-1-3-1
name: cluster-local-gateway
- kustomizeConfig:
repoRef:
name: manifests
path: istio/istio/base
name: istio
- kustomizeConfig:
repoRef:
name: manifests
path: application/v3
name: application
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/bootstrap
name: bootstrap
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cert-manager-crds
name: cert-manager-crds
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cert-manager-kube-system-resources
name: cert-manager-kube-system-resources
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/cert-manager
name: cert-manager
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/oidc-authservice
name: oidc-authservice
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/dex-auth
name: dex-auth
- kustomizeConfig:
repoRef:
name: manifests
path: metacontroller/base
name: metacontroller
# Install kubeflow applications.
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/multi-user
name: kubeflow-apps
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/spark-operator
name: spark-operator
- kustomizeConfig:
repoRef:
name: manifests
path: knative/installs/generic
name: knative
- kustomizeConfig:
repoRef:
name: manifests
path: kfserving/installs/generic
name: kfserving
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/spartakus
name: spartakus
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/tensorboard
name: tensorboard
repos:
- name: manifests
uri: https://github.com/kubeflow/manifests/archive/v1.1.0.tar.gz
version: v1.1.0
17 changes: 11 additions & 6 deletions kfdef/kfctl_ibm_dex.yaml → kfdef/kfctl_ibm_dex_multi_user.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ metadata:
namespace: kubeflow
spec:
applications:
- kustomizeConfig:
repoRef:
name: manifests
path: namespaces/base
name: namespaces
# Install istio in a different namespace: istio-system
# Remove this application if istio is already installed
- kustomizeConfig:
Expand All @@ -19,7 +24,7 @@ spec:
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/istio
path: istio/istio/base
name: istio
- kustomizeConfig:
repoRef:
Expand Down Expand Up @@ -56,17 +61,17 @@ spec:
name: manifests
path: stacks/ibm/application/dex-auth
name: dex-auth
# Install kubeflow applications.
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm
name: kubeflow-apps
path: metacontroller/base
name: metacontroller
# Install kubeflow applications.
- kustomizeConfig:
repoRef:
name: manifests
path: stacks/ibm/application/metadata
name: metadata
path: stacks/ibm/multi-user
name: kubeflow-apps
- kustomizeConfig:
repoRef:
name: manifests
Expand Down
3 changes: 2 additions & 1 deletion pipeline/installs/multi-user/api-service/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ resources:
- cluster-role.yaml
configMapGenerator:
- name: pipeline-api-server-config
env: params.env
envs:
- params.env
2 changes: 2 additions & 0 deletions stacks/ibm/application/dex-auth/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ configMapGenerator:
literals:
- issuer="http://dex.auth.svc.cluster.local:5556/dex"
- oidc_redirect_uris=["/login/oidc"]
- static_password_hash=$2b$10$ztyRMtzZ.CgC7KKeHsJuku03GWTjt0d0ClcCz4J2qG2FdVnJB8a8a
- client_id=kubeflow-oidc-authservice
9 changes: 0 additions & 9 deletions stacks/ibm/application/pipelines-ui/kustomization.yaml

This file was deleted.

11 changes: 3 additions & 8 deletions stacks/ibm/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ resources:
- application/jupyter-web-app
- application/notebook-controller
- application/profiles
- ../../argo/base_v3
- ../../pipeline/api-service/overlays/application
- ../../pipeline/minio/installs/ibm
- ../../pipeline/mysql/installs/ibm
- ../../pipeline/persistent-agent/overlays/application
- ../../pipeline/pipelines-runner/overlays/application
- application/pipelines-ui
- ../../pipeline/pipelines-viewer/overlays/application
- ../../pipeline/scheduledworkflow/overlays/application
- ../../pipeline/pipeline-visualization-service/overlays/application
- ../../pipeline/installs/generic
- ../../argo/base_v3
- application/metadata
- ../../pytorch-job/pytorch-job-crds/overlays/application
- ../../pytorch-job/pytorch-operator/overlays/application
- ../../tf-training/tf-job-crds/overlays/application
Expand Down
5 changes: 5 additions & 0 deletions stacks/ibm/multi-user/config/params.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
clusterDomain=cluster.local
userid-header=kubeflow-userid
userid-prefix=
cluster-name=
istio-namespace=istio-system
65 changes: 65 additions & 0 deletions stacks/ibm/multi-user/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kubeflow
resources:
- ../../../admission-webhook/webhook/v3
- ../../../common/centraldashboard/overlays/stacks
- ../../../kubeflow-roles/base
- ../application/jupyter-web-app
- ../application/notebook-controller
- ../application/profiles
- ../../../pipeline/minio/installs/ibm
- ../../../pipeline/mysql/installs/ibm
- ../../../pipeline/installs/multi-user
- ../../../argo/base_v3
- ../application/metadata
- ../../../pytorch-job/pytorch-job-crds/overlays/application
- ../../../pytorch-job/pytorch-operator/overlays/application
- ../../../tf-training/tf-job-crds/overlays/application
- ../../../tf-training/tf-job-operator/overlays/application
- ../../../katib/installs/katib-standalone-ibm
- ../../../seldon/seldon-core-operator/overlays/application
configMapGenerator:
- name: pipeline-mysql-parameters
behavior: merge
literals:
- mysqlPvcName=mysql-pv-claim
- name: pipeline-minio-parameters
behavior: merge
literals:
- minioPvcName=minio-pv-claim
- name: workflow-controller-parameters
behavior: merge
literals:
- containerRuntimeExecutor=pns
- name: profiles-config
behavior: merge
literals:
- admin=example@kubeflow.org
- name: kubeflow-config
envs:
- ./config/params.env
vars:
# We need to define vars at the top level otherwise we will get
# conflicts.
- fieldref:
fieldPath: data.clusterDomain
name: clusterDomain
objref:
apiVersion: v1
kind: ConfigMap
name: kubeflow-config
- fieldref:
fieldPath: metadata.namespace
name: namespace
objref:
apiVersion: v1
kind: ConfigMap
name: kubeflow-config
- fieldref:
fieldpath: metadata.namespace
name: katib-ui-namespace
objref:
kind: Service
name: katib-ui
apiVersion: v1
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ rules:
- ""
resources:
- secrets
- configmaps
verbs:
- get
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data:
namespace: auth
oidc_redirect_uris: '["/login/oidc"]'
static_email: admin@example.com
static_password_hash: $2a$10$2b2cU8CPhOTaGrs1HRQuAueS7JTT5ZHsHSzYiFPm1leZck7Mc8T4W
static_password_hash: $2b$10$ztyRMtzZ.CgC7KKeHsJuku03GWTjt0d0ClcCz4J2qG2FdVnJB8a8a
static_user_id: 08a8684b-db88-4b73-90a9-3cd1661f5466
static_username: admin
kind: ConfigMap
Expand Down
Loading