Skip to content

Commit 20152f4

Browse files
wzshimingwzshiming
authored
Bump lws to v0.9.0 (kubernetes-sigs#1669)
1 parent c37c091 commit 20152f4

5 files changed

Lines changed: 14 additions & 10 deletions

File tree

‎pkg/consts/consts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var (
8282
JobSetImagePrefix = "registry.k8s.io/jobset"
8383
JobSetManifestPrefix = "https://github.com/kubernetes-sigs/jobset/releases/download"
8484

85-
LWSVersion = "0.8.0"
85+
LWSVersion = "0.9.0"
8686
LWSBinaryPrefix = ""
8787
LWSImagePrefix = "registry.k8s.io/lws"
8888
LWSManifestPrefix = "https://github.com/kubernetes-sigs/lws/releases/download"

‎pkg/kwokctl/components/lws_manifest.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ func BuildLWSManifest(conf BuildLWSManifestConfig) ([]string, error) {
4949
return transformCRDConversionWebhook(obj.Object, int64(conf.Port), conf.CABundle)
5050
},
5151
},
52+
{
53+
Kind: "CustomResourceDefinition",
54+
APIVersion: "apiextensions.k8s.io/v1",
55+
},
5256
{
5357
Kind: "Service",
5458
APIVersion: "v1",

‎test/e2e/kwokctl/dryrun/testdata/docker/create_cluster_with_verbosity.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ docker pull registry.k8s.io/kueue/kueueviz-backend:v0.18.1
4848
docker pull registry.k8s.io/kueue/kueueviz-frontend:v0.18.1
4949
docker pull registry.k8s.io/jobset/jobset:v0.12.0
5050
# Download https://github.com/kubernetes-sigs/jobset/releases/download/v0.12.0/manifests.yaml to <ROOT_DIR>/workdir/cache/manifest/4bb02b1bfadb99929cbef68ca0bfe81cb98de0ea63ad3b7bfb5592f8f0af768f.yaml
51-
docker pull registry.k8s.io/lws/lws:v0.8.0
52-
# Download https://github.com/kubernetes-sigs/lws/releases/download/v0.8.0/manifests.yaml to <ROOT_DIR>/workdir/cache/manifest/0ae8d948e6a49e7e41aeefdeec8642a84cb8ad66430c2711910e6f52937ded08.yaml
51+
docker pull registry.k8s.io/lws/lws:v0.9.0
52+
# Download https://github.com/kubernetes-sigs/lws/releases/download/v0.9.0/manifests.yaml to <ROOT_DIR>/workdir/cache/manifest/9e7adc39b4c73d4acf9df0e1c11fa9784f2495df024dbb0f6268e8073d7641c2.yaml
5353
docker pull registry.k8s.io/descheduler/descheduler:v0.36.0
5454
# Build github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=v0.36.0 by kubectl kustomize to <ROOT_DIR>/workdir/cache/manifest/8f83406e4a180f058e2e7ec9fcbba2b829ee6225b52e716de6825c44cad62c8d.yaml
5555
cat <<EOF ><ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/prometheus.yaml
@@ -194,7 +194,7 @@ docker create --name=kwok-<CLUSTER_NAME>-kwok-controller --pull=never --entrypoi
194194
docker create --name=kwok-<CLUSTER_NAME>-dashboard --pull=never --network=kwok-<CLUSTER_NAME> --user=root --link=kwok-<CLUSTER_NAME>-kube-apiserver --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --publish=8000:8080/tcp --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:~/.kube/config:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro docker.io/kubernetesui/dashboard:v2.7.0 --insecure-bind-address=0.0.0.0 --bind-address=127.0.0.1 --port=0 --enable-insecure-login --enable-skip-login --disable-settings-authorizer --sidecar-host=kwok-<CLUSTER_NAME>-dashboard-metrics-scraper:8000 --system-banner=Welcome to kwok-<CLUSTER_NAME> --kubeconfig=~/.kube/config --insecure-port=8080
195195
docker create --name=kwok-<CLUSTER_NAME>-kueue --pull=never --entrypoint=/manager --network=kwok-<CLUSTER_NAME> --user=root --link=kwok-<CLUSTER_NAME>-kube-apiserver --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:~/.kube/config:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kueue/metrics/certs/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kueue/metrics/certs/tls.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kueue/metrics/certs/tls.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/tmp/k8s-webhook-server/serving-certs/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/tmp/k8s-webhook-server/serving-certs/tls.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/tmp/k8s-webhook-server/serving-certs/tls.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/visibility/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/visibility/tls.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/visibility/tls.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kueue.yaml:/controller_manager_config.yaml:ro --env=NAMESPACE=kueue-system registry.k8s.io/kueue/kueue:v0.18.1 --config=/controller_manager_config.yaml --kubeconfig=~/.kube/config
196196
docker create --name=kwok-<CLUSTER_NAME>-jobset --pull=never --entrypoint=/manager --network=kwok-<CLUSTER_NAME> --user=root --link=kwok-<CLUSTER_NAME>-kube-apiserver --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:~/.kube/config:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/tmp/k8s-webhook-server/serving-certs/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/tmp/k8s-webhook-server/serving-certs/tls.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/tmp/k8s-webhook-server/serving-certs/tls.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/jobset.yaml:/controller_manager_config.yaml:ro registry.k8s.io/jobset/jobset:v0.12.0 --config=/controller_manager_config.yaml --kubeconfig=~/.kube/config
197-
docker create --name=kwok-<CLUSTER_NAME>-lws --pull=never --entrypoint=/manager --network=kwok-<CLUSTER_NAME> --user=root --link=kwok-<CLUSTER_NAME>-kube-apiserver --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:~/.kube/config:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/tmp/k8s-webhook-server/serving-certs/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/tmp/k8s-webhook-server/serving-certs/tls.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/tmp/k8s-webhook-server/serving-certs/tls.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/lws.yaml:/controller_manager_config.yaml:ro registry.k8s.io/lws/lws:v0.8.0 --config=/controller_manager_config.yaml --kubeconfig=~/.kube/config
197+
docker create --name=kwok-<CLUSTER_NAME>-lws --pull=never --entrypoint=/manager --network=kwok-<CLUSTER_NAME> --user=root --link=kwok-<CLUSTER_NAME>-kube-apiserver --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:~/.kube/config:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/tmp/k8s-webhook-server/serving-certs/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/tmp/k8s-webhook-server/serving-certs/tls.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/tmp/k8s-webhook-server/serving-certs/tls.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/lws.yaml:/controller_manager_config.yaml:ro registry.k8s.io/lws/lws:v0.9.0 --config=/controller_manager_config.yaml --kubeconfig=~/.kube/config
198198
docker create --name=kwok-<CLUSTER_NAME>-descheduler --pull=never --entrypoint=/bin/descheduler --network=kwok-<CLUSTER_NAME> --user=0 --link=kwok-<CLUSTER_NAME>-kube-apiserver --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:/tmp/kubeconfig:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/descheduler.yaml:/policy-config-file.yaml:ro registry.k8s.io/descheduler/descheduler:v0.36.0 --kubeconfig=/tmp/kubeconfig --descheduling-interval=5m --policy-config-file=/policy-config-file.yaml
199199
docker create --name=kwok-<CLUSTER_NAME>-metrics-server --pull=never --entrypoint=/metrics-server --network=kwok-<CLUSTER_NAME> --user=root --link=kwok-<CLUSTER_NAME>-kwok-controller --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/kubeconfig:~/.kube/config:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/ca.crt:/etc/kubernetes/pki/ca.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro registry.k8s.io/metrics-server/metrics-server:v0.8.1 --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname --kubelet-use-node-status-port --kubelet-insecure-tls --metric-resolution=15s --bind-address=0.0.0.0 --secure-port=4443 --kubeconfig=~/.kube/config --authentication-kubeconfig=~/.kube/config --authorization-kubeconfig=~/.kube/config --tls-cert-file=/etc/kubernetes/pki/admin.crt --tls-private-key-file=/etc/kubernetes/pki/admin.key
200200
docker create --name=kwok-<CLUSTER_NAME>-prometheus --pull=never --entrypoint=prometheus --network=kwok-<CLUSTER_NAME> --link=kwok-<CLUSTER_NAME>-etcd --link=kwok-<CLUSTER_NAME>-kube-apiserver --link=kwok-<CLUSTER_NAME>-kwok-controller --link=kwok-<CLUSTER_NAME>-kube-controller-manager --link=kwok-<CLUSTER_NAME>-kube-scheduler --restart=unless-stopped --label=com.docker.compose.project=kwok-<CLUSTER_NAME> --publish=9090:9090/tcp --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/prometheus.yaml:/etc/prometheus/prometheus.yaml:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.crt:/etc/kubernetes/pki/admin.crt:ro --volume=<ROOT_DIR>/workdir/clusters/<CLUSTER_NAME>/pki/admin.key:/etc/kubernetes/pki/admin.key:ro docker.io/prom/prometheus:v3.12.0 --config.file=/etc/prometheus/prometheus.yaml --web.listen-address=0.0.0.0:9090

0 commit comments

Comments
 (0)