Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kubeflow 1.8] Update kubeflow/katib manifests from v0.16.0-rc.1 #2506

Merged
Show file tree
Hide file tree
Changes from 3 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
18 changes: 18 additions & 0 deletions .github/workflows/katib_kind_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,21 @@ jobs:

echo "Waiting for the Experiment to become Succeeded..."
kubectl wait --for=condition=Succeeded experiments.kubeflow.org -n kubeflow-user --all --timeout 300s

- name: Save relevant debug artifacts
Copy link
Member

Choose a reason for hiding this comment

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

this can be removed now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, will do.

if: failure()
run: |
mkdir ~/katib-debug-logs
bash -c "df -h | tee ~/katib-debug-logs/df.log"
bash -c "free -h | tee ~/katib-debug-logs/free.log"
kubectl describe deployments -A | tee ~/katib-debug-logs/deployments.log
kubectl describe nodes | tee ~/katib-debug-logs/nodes.log
kubectl describe pods -A | tee ~/katib-debug-logs/describe-pods.log
kubectl get pods -A | tee ~/katib-debug-logs/get-pods.log

- name: Upload debug artifacts
if: failure()
uses: actions/upload-artifact@v3
with:
name: katib-debug-logs
path: ~/katib-debug-logs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ This repo periodically syncs all official Kubeflow components from their respect
| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.7.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.7.0-rc.0/components/crud-web-apps/jupyter/manifests) |
| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.7.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.7.0-rc.0/components/crud-web-apps/tensorboards/manifests) |
| Volumes Web App | apps/volumes-web-app/upstream | [v1.7.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.7.0-rc.0/components/crud-web-apps/volumes/manifests) |
| Katib | apps/katib/upstream | [v0.15.0-rc.0](https://github.com/kubeflow/katib/tree/v0.15.0-rc.0/manifests/v1beta1) |
| Katib | apps/katib/upstream | [v0.16.0-rc.1](https://github.com/kubeflow/katib/tree/v0.16.0-rc.1/manifests/v1beta1) |
| KServe | contrib/kserve/kserve | [v0.10.0](https://github.com/kserve/kserve/tree/v0.10.0/install/v0.10.0) |
| KServe Models Web App | contrib/kserve/models-web-app | [v0.10.0](https://github.com/kserve/models-web-app/tree/v0.10.0/config) |
| Kubeflow Pipelines | apps/pipeline/upstream | [2.0.0-alpha.7](https://github.com/kubeflow/pipelines/tree/2.0.0-alpha.7/manifests/kustomize) |
Expand Down
27 changes: 0 additions & 27 deletions apps/katib/upstream/components/cert-generator/cert-generator.yaml

This file was deleted.

This file was deleted.

48 changes: 0 additions & 48 deletions apps/katib/upstream/components/cert-generator/rbac.yaml

This file was deleted.

16 changes: 9 additions & 7 deletions apps/katib/upstream/components/controller/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
metadata:
labels:
katib.kubeflow.org/component: controller
katib.kubeflow.org/metrics-collector-injection: disabled
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8080"
Expand All @@ -26,13 +27,7 @@ spec:
image: docker.io/kubeflowkatib/katib-controller
command: ["./katib-controller"]
args:
- "--webhook-port=8443"
- "--trial-resources=Job.v1.batch"
- "--trial-resources=TFJob.v1.kubeflow.org"
- "--trial-resources=PyTorchJob.v1.kubeflow.org"
- "--trial-resources=MPIJob.v1.kubeflow.org"
- "--trial-resources=XGBoostJob.v1.kubeflow.org"
- "--trial-resources=MXJob.v1.kubeflow.org"
- --katib-config=/katib-config.yaml
ports:
- containerPort: 8443
name: webhook
Expand Down Expand Up @@ -60,8 +55,15 @@ spec:
- mountPath: /tmp/cert
name: cert
readOnly: true
- mountPath: /katib-config.yaml
name: katib-config
subPath: katib-config.yaml
readOnly: true
volumes:
- name: cert
secret:
defaultMode: 420
secretName: katib-webhook-cert
- name: katib-config
configMap:
name: katib-config
81 changes: 0 additions & 81 deletions apps/katib/upstream/components/controller/katib-config.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: Kustomization

resources:
- controller.yaml
- katib-config.yaml
- rbac.yaml
- service.yaml
- trial-templates.yaml
19 changes: 19 additions & 0 deletions apps/katib/upstream/components/controller/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ rules:
- pods/status
verbs:
- "get"
- apiGroups:
- ""
resources:
- secrets
verbs:
- "get"
- "list"
- "watch"
- "patch"
- apiGroups:
- apps
resources:
Expand Down Expand Up @@ -108,6 +117,16 @@ rules:
- suggestions/finalizers
verbs:
- "*"
- apiGroups:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
- mutatingwebhookconfigurations
verbs:
- "get"
- "watch"
- "list"
- "patch"
---
apiVersion: v1
kind: ServiceAccount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data:
spec:
containers:
- name: training-container
image: docker.io/kubeflowkatib/mxnet-mnist:v0.15.0-rc.0
image: docker.io/kubeflowkatib/mxnet-mnist:v0.16.0-rc.1
command:
- "python3"
- "/opt/mxnet-mnist/mnist.py"
Expand All @@ -33,7 +33,7 @@ data:
spec:
containers:
- name: training-container
image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.15.0-rc.0
image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.16.0-rc.1
command:
- python3
- -u
Expand All @@ -54,7 +54,7 @@ data:
spec:
containers:
- name: pytorch
image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.15.0-rc.0
image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.16.0-rc.1
command:
- "python3"
- "/opt/pytorch-mnist/mnist.py"
Expand All @@ -68,7 +68,7 @@ data:
spec:
containers:
- name: pytorch
image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.15.0-rc.0
image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.16.0-rc.1
command:
- "python3"
- "/opt/pytorch-mnist/mnist.py"
Expand Down
4 changes: 2 additions & 2 deletions apps/katib/upstream/components/db-manager/db-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ spec:
- name: api
containerPort: 6789
livenessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:6789"]
grpc:
port: 6789
initialDelaySeconds: 10
periodSeconds: 60
failureThreshold: 5
13 changes: 10 additions & 3 deletions apps/katib/upstream/components/webhook/webhooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
webhooks:
- name: validator.experiment.katib.kubeflow.org
sideEffects: None
failurePolicy: Ignore
admissionReviewVersions:
- v1
clientConfig:
Expand All @@ -33,7 +32,6 @@ metadata:
webhooks:
- name: defaulter.experiment.katib.kubeflow.org
sideEffects: None
failurePolicy: Ignore
admissionReviewVersions:
- v1
clientConfig:
Expand All @@ -54,7 +52,6 @@ webhooks:
- experiments
- name: mutator.pod.katib.kubeflow.org
sideEffects: None
failurePolicy: Ignore
admissionReviewVersions:
- v1
clientConfig:
Expand All @@ -66,6 +63,16 @@ webhooks:
namespaceSelector:
matchLabels:
katib.kubeflow.org/metrics-collector-injection: enabled
# Once the AdmissionWebhookMatchConditions feature gate is enabled by default, we should switch to control based on userInfo.
# REF:
# - AdmissionWebhookMatchConditions: https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-matchconditions
# - Tracking issue: https://github.com/kubeflow/katib/issues/2206
objectSelector:
matchExpressions:
- key: katib.kubeflow.org/metrics-collector-injection
operator: NotIn
values:
- disabled
rules:
- apiGroups:
- ""
Expand Down
Loading