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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion katib/katib-controller/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.clusterDomain
- name: namespace
- name: katib-ui-namespace
objref:
kind: Service
name: katib-ui
Expand Down
3 changes: 1 addition & 2 deletions katib/katib-controller/overlays/application/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-controller-0.8.0
app.kubernetes.io/instance: katib-controller
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-controller
app.kubernetes.io/part-of: kubeflow
app.kubernetes.io/version: 0.8.0
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ bases:
- ../../base
commonLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-controller-0.8.0
app.kubernetes.io/instance: katib-controller
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-controller
app.kubernetes.io/part-of: kubeflow
app.kubernetes.io/version: 0.8.0
kind: Kustomization
resources:
- application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ spec:
uri: /katib/
route:
- destination:
host: katib-ui.$(namespace).svc.$(clusterDomain)
host: katib-ui.$(katib-ui-namespace).svc.$(clusterDomain)
port:
number: 80
42 changes: 42 additions & 0 deletions katib/katib-controller/v3/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kubeflow
resources:
- ../base/katib-configmap.yaml

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.

So per comment: #1124 (comment)

I think this should be something like

resources:

  • ../katib-system
  • ../katib-db-manager
  • ../katib-mysql

The resources listed here would then move into the respective packages.

patchesStrategicMerge

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.

Yes I agree, we can use patch here.
What do you think @discordianfish, can you make these changes in #986 PR?

/cc @johnugeorge @gaocegege

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.

I think in #986 @discordianfish said he didn't have time to make any additional changes. So maybe @andreyvelich you could just make the changes in this PR? Or a follow on PR?

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.

I was waiting for you to settle on one way to do it. But now it's probably better to merge this here first. I can look into a new PR to change this.

- ../base/katib-controller-deployment.yaml
- ../base/katib-controller-rbac.yaml
- ../base/katib-controller-secret.yaml
- ../base/katib-controller-service.yaml
- ../base/katib-mysql-deployment.yaml
- ../base/katib-mysql-pvc.yaml
- ../base/katib-mysql-secret.yaml
- ../base/katib-mysql-service.yaml
- ../base/katib-db-manager-deployment.yaml
- ../base/katib-db-manager-service.yaml
- ../base/katib-ui-deployment.yaml
- ../base/katib-ui-rbac.yaml
- ../base/katib-ui-service.yaml
- ../base/trial-template-configmap.yaml
- ../overlays/application/application.yaml
- ../overlays/istio/katib-ui-virtual-service.yaml
images:
- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
newTag: v0.8.0
newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
newTag: v0.8.0
newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
newTag: v0.8.0
newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
- name: mysql
newTag: "8"
newName: mysql
commonLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-controller
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-controller
app.kubernetes.io/part-of: kubeflow
configurations:
- params.yaml
3 changes: 3 additions & 0 deletions katib/katib-controller/v3/params.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
varReference:
- path: spec/http/route/destination/host
kind: VirtualService
3 changes: 1 addition & 2 deletions katib/katib-crds/overlays/application/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-crds-0.8.0
app.kubernetes.io/instance: katib-crds
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-crds
app.kubernetes.io/part-of: kubeflow
app.kubernetes.io/version: 0.8.0
3 changes: 1 addition & 2 deletions katib/katib-crds/overlays/application/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ bases:
- ../../base
commonLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-crds-0.8.0
app.kubernetes.io/instance: katib-crds
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-crds
app.kubernetes.io/part-of: kubeflow
app.kubernetes.io/version: 0.8.0
kind: Kustomization
resources:
- application.yaml
14 changes: 14 additions & 0 deletions katib/katib-crds/v3/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kubeflow
resources:
- ../base/experiment-crd.yaml
- ../base/suggestion-crd.yaml
- ../base/trial-crd.yaml
- ../overlays/application/application.yaml
commonLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-crds
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-crds
app.kubernetes.io/part-of: kubeflow
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-controller-0.8.0
app.kubernetes.io/instance: katib-controller
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-controller
app.kubernetes.io/part-of: kubeflow
app.kubernetes.io/version: 0.8.0
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/component: katib
app.kubernetes.io/instance: katib-crds-0.8.0
app.kubernetes.io/instance: katib-crds
app.kubernetes.io/managed-by: kfctl
app.kubernetes.io/name: katib-crds
app.kubernetes.io/part-of: kubeflow
app.kubernetes.io/version: 0.8.0