Skip to content

Commit

Permalink
Cherry Pick of KF 1.3 IBM IKS release (#1823) (#1863)
Browse files Browse the repository at this point in the history
* application path update: certmanager, istio, authservice

* application path update: certmanager, istio, kfserving, knative

* delete deprecated/unused component

application path update: namespace, roles, katib, central dashboard

* application path update: notebook, tensorboard, mpi, xgboost...

* application path update: dex, mxnet, kfp-argo

* add kfp-tekton to ibm distribution

update oidc appid to create secret for clientId and secret
move kubeflow istio resources to own application folder

* ibm 1.3 kfdef

* change kubeflow istio resources to own applicaiton

* add fixed nodeport for istio ingressgateway

* Don't overwrite all namespaces to kubeflow

* add kfdef for ibm kubeflow 1.3

add dex for single user
add oauthservice for dex

* add new line at end of file

* kfdef reporef name fix

* kfdef reporef kustomization fix

* add moficodes and pvaneck to IBM distribution owners

remove adrian555 from IBM Distribution owners

* add kfserving to kfdef

* remove duplicate compononet from kfdef

* reorder profile component

profile crds need to be created before we try to create profile instance
  • Loading branch information
moficodes authored Apr 21, 2021
1 parent 0ecacf5 commit 4bcdbb1
Show file tree
Hide file tree
Showing 69 changed files with 545 additions and 761 deletions.
181 changes: 181 additions & 0 deletions distributions/kfdef/kfctl_ibm.v1.3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
apiVersion: kfdef.apps.kubeflow.org/v1
kind: KfDef
metadata:
namespace: kubeflow
spec:
applications:
# Install istio in a different namespace: istio-system
# Remove this application if istio is already installed
# cert-manager
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/cert-manager-crds
name: cert-manager-crds
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/cert-manager-kube-system-resources
name: cert-manager-kube-system-resources
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/cert-manager
name: cert-manager

#istio
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/istio-1-9-0
name: istio-stack
# knative
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/knative
name: knative

# kfserving
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kfserving
name: kfserving

# kubeflow namespace
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kubeflow-namespace
name: kubeflow-namespace
# kubeflow roles
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kubeflow-roles
name: kubeflow-roles
# profiles
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/profiles
name: kubeflow-apps

- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/oidc-authservice
name: oidc-authservice
# dex
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/dex-auth
name: dex-auth
# user namespace
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/user-namespace
name: user-namespace

# Kubeflow components
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/admission-webhook
name: admission-webhook

# central dashboard multiuser
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/centraldashboard/single-user
name: centraldashboard


# katib
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/katib
name: katib
# pipeline
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kfp-tekton
name: kfp-tekton
# Default on IBM Cloud is Kubeflow Pipelines with Tekton. Switch the above kfp-tekton to
# the below applications if you want to
# run Kubeflow Pipelines with Argo
# - kustomizeConfig:
# repoRef:
# name: manifests
# path: distributions/stacks/ibm/application/kfp-argo
# name: kfp-argo
# notebooks controller
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/notebook-controller
name: notebooks-controller
# jupyter web app
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/jupyter-web-app/insecure
name: jupyter-web-app
# tensorboard controller
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/tensorboard-controller
name: tensorboard-controller
# tensorboard web app
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/tensorboard-web-app/insecure
name: tensorboard-web-app
# volumes web app
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/volumes-web-app/insecure
name: volumes-web-app
# pytorch job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/pytorch-job
name: pytorch-job
# tf job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/tf-job
name: tf-job
# mpi job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/mpi-job
name: mpi-job
# mxnet job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/mxnet-job
name: mxnet-job
# xgboost job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/xgboost-job
name: xgboost-job
repos:
- name: manifests
uri: https://github.com/kubeflow/manifests/archive/v1.3-branch.tar.gz
version: v1.3-branch
167 changes: 167 additions & 0 deletions distributions/kfdef/kfctl_ibm_multi_user.v1.3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
apiVersion: kfdef.apps.kubeflow.org/v1
kind: KfDef
metadata:
namespace: kubeflow
spec:
applications:
# Install istio in a different namespace: istio-system
# Remove this application if istio is already installed
# cert-manager
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/cert-manager-crds
name: cert-manager-crds
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/cert-manager-kube-system-resources
name: cert-manager-kube-system-resources
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/cert-manager
name: cert-manager

#istio
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/istio-1-9-0
name: istio-stack
# knative
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/knative
name: knative

# kfserving
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kfserving
name: kfserving

# kubeflow namespace
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kubeflow-namespace
name: kubeflow-namespace
# kubeflow roles
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kubeflow-roles
name: kubeflow-roles

# profiles
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/profiles
name: kubeflow-apps

- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/oidc-authservice-appid
name: oidc-authservice-appid
# Kubeflow components
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/admission-webhook
name: admission-webhook
# central dashboard multiuser
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/centraldashboard/multi-user
name: centraldashboard

# katib
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/katib
name: katib
# pipeline
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/kfp-tekton
name: kfp-tekton
# Default on IBM Cloud is Kubeflow Pipelines with Tekton. Switch the above kfp-tekton to
# the below applications if you want to
# run Kubeflow Pipelines with Argo
# - kustomizeConfig:
# repoRef:
# name: manifests
# path: distributions/stacks/ibm/application/kfp-argo
# name: kfp-argo
# notebooks controller
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/notebook-controller
name: notebooks-controller
# jupyter web app
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/jupyter-web-app/insecure
name: jupyter-web-app
# tensorboard controller
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/tensorboard-controller
name: tensorboard-controller
# tensorboard web app . remove insecure if tls is enabled
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/tensorboard-web-app/insecure
name: tensorboard-web-app
# volumes web app
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/volumes-web-app/insecure
name: volumes-web-app
# pytorch job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/pytorch-job
name: pytorch-job
# tf job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/tf-job
name: tf-job
# mpi job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/mpi-job
name: mpi-job
# mxnet job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/mxnet-job
name: mxnet-job
# xgboost job
- kustomizeConfig:
repoRef:
name: manifests
path: distributions/stacks/ibm/application/xgboost-job
name: xgboost-job
repos:
- name: manifests
uri: https://github.com/kubeflow/manifests/archive/v1.3-branch.tar.gz
version: v1.3-branch
3 changes: 2 additions & 1 deletion distributions/stacks/ibm/OWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
approvers:
- adrian555
- animeshsingh
- tomcli
- moficodes
- pvaneck
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kubeflow
resources:
- ../../../../admission-webhook/webhook/v3
configMapGenerator:
- 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

- ../../../../../apps/admission-webhook/upstream/overlays/cert-manager
Loading

0 comments on commit 4bcdbb1

Please sign in to comment.