From fed2fca82afbf2c938f3275b7bc5396352f1f1c7 Mon Sep 17 00:00:00 2001 From: pengluan Date: Wed, 27 Jul 2022 12:55:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E7=BD=B2=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/kubernetes/all_image.py | 21 +------ install/kubernetes/pull_image_kubeflow.sh | 75 +++++++++++------------ install/kubernetes/spark/install.yaml | 2 +- myapp/init-job-template.json | 32 +++++----- 4 files changed, 56 insertions(+), 74 deletions(-) diff --git a/install/kubernetes/all_image.py b/install/kubernetes/all_image.py index cca9ac3c..130a99b4 100644 --- a/install/kubernetes/all_image.py +++ b/install/kubernetes/all_image.py @@ -5,7 +5,6 @@ kubeflow = [ 'metacontroller/metacontroller:v0.3.0', 'alpine:3.10', "busybox", - "gcr.io/spark-operator/spark-operator:v1beta2-1.3.0-3.1.1", "ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator", 'ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1', ] @@ -48,20 +47,7 @@ new_prometheus = [ "k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.1", 'grafana/grafana:7.5.2' ] -new_serving = [ - 'gcr.io/kfserving/alibi-explainer:0.2.2', 'gcr.io/kfserving/logger:0.2.2', 'tensorflow/serving:1.14.0', - 'tensorflow/serving:1.14.0-gpu', 'tensorflow/serving:1.11.0', 'tensorflow/serving:1.11.0-gpu', - 'tensorflow/serving:1.12.0', 'tensorflow/serving:1.12.0-gpu', 'tensorflow/serving:1.13.0', - 'tensorflow/serving:1.13.0-gpu', 'tensorflow/serving:1.14.0', 'tensorflow/serving:1.14.0-gpu', - 'tensorflow/serving:2.0.0', 'tensorflow/serving:2.0.0-gpu', 'tensorflow/serving:2.1.0', - 'tensorflow/serving:2.1.0-gpu', 'tensorflow/serving:2.2.0', 'tensorflow/serving:2.2.0-gpu', - 'tensorflow/serving:2.3.0', 'tensorflow/serving:2.3.0-gpu', 'tensorflow/serving:2.4.0', - 'tensorflow/serving:2.4.0-gpu', 'mcr.microsoft.com/onnxruntime/server:v0.5.1', - 'gcr.io/kfserving/sklearnserver:0.2.2', 'gcr.io/kfserving/xgbserver:0.2.2', - 'gcr.io/kfserving/pytorchserver:0.2.2', 'nvcr.io/nvidia/tensorrtserver:19.05-py3', - 'gcr.io/kfserving/storage-initializer:0.2.2', - 'gcr.io/knative-releases/knative.dev/serving/cmd/queue:792f6945c7bc73a49a470a5b955c39c8bd174705743abf5fb71aa0f4c04128eb' -] + istio=[ "istio/proxyv2:1.14.1","istio/pilot:1.14.1" ] @@ -146,11 +132,10 @@ cube_studio = [ 'ccr.ccs.tencentyun.com/cube-studio/ubuntu-gpu:cuda9.1-cudnn7-python3.6', 'ccr.ccs.tencentyun.com/cube-studio/ubuntu-gpu:cuda9.1-cudnn7-python3.7', 'ccr.ccs.tencentyun.com/cube-studio/ubuntu-gpu:cuda9.1-cudnn7-python3.8', - ] -images = kubeflow + kubernetes_dashboard + new_pipline + new_gpu + new_prometheus + new_serving + istio + volcano + kube_batch + nni+ cube_studio -images = kubeflow + kubernetes_dashboard + new_pipline + new_gpu + new_prometheus + istio + volcano + kube_batch + nni +# images = kubeflow + kubernetes_dashboard + new_pipline + new_gpu + new_prometheus + volcano + kube_batch + nni+ cube_studio +images = kubeflow + kubernetes_dashboard + new_pipline + new_gpu + new_prometheus + volcano + kube_batch + nni # images = new_pipline images = list(set(images)) diff --git a/install/kubernetes/pull_image_kubeflow.sh b/install/kubernetes/pull_image_kubeflow.sh index 4d5c4f66..b27eeb39 100644 --- a/install/kubernetes/pull_image_kubeflow.sh +++ b/install/kubernetes/pull_image_kubeflow.sh @@ -1,49 +1,46 @@ -docker pull ccr.ccs.tencentyun.com/cube-studio/bitnami-redis && docker tag ccr.ccs.tencentyun.com/cube-studio/bitnami-redis bitnami/redis & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-rbac-proxy:v0.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-rbac-proxy:v0.3.1 quay.io/coreos/kube-rbac-proxy:v0.3.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.12.9-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.12.9-license-compliance gcr.io/ml-pipeline/argoexec:v2.12.9-license-compliance & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-writer:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-writer:1.6.0 gcr.io/ml-pipeline/metadata-writer:1.6.0 & docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.48.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.48.0 quay.io/prometheus-operator/prometheus-config-reloader:v0.48.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-controller-manager:v1.4.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-controller-manager:v1.4.0 volcanosh/vc-controller-manager:v1.4.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.56.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.56.1 quay.io/prometheus-operator/prometheus-config-reloader:v0.56.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-scheduledworkflow:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-scheduledworkflow:1.6.0 gcr.io/ml-pipeline/scheduledworkflow:1.6.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/istio-proxyv2:1.14.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/istio-proxyv2:1.14.1 istio/proxyv2:1.14.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:7.5.2 && docker tag ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:7.5.2 grafana/grafana:7.5.2 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-envoy:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-envoy:1.6.0 gcr.io/ml-pipeline/metadata-envoy:1.6.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-tfx-oss-public-ml_metadata_store_server:0.30.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-tfx-oss-public-ml_metadata_store_server:0.30.0 gcr.io/tfx-oss-public/ml_metadata_store_server:0.30.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.46.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.46.0 quay.io/prometheus-operator/prometheus-config-reloader:v0.46.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/metacontroller-metacontroller:v0.3.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/metacontroller-metacontroller:v0.3.0 metacontroller/metacontroller:v0.3.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/kubesigs-kube-batch:v0.5 && docker tag ccr.ccs.tencentyun.com/cube-studio/kubesigs-kube-batch:v0.5 kubesigs/kube-batch:v0.5 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-visualization-server:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-visualization-server:1.6.0 gcr.io/ml-pipeline/visualization-server:1.6.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/nvidia-dcgm-exporter:2.3.1-2.6.1-ubuntu20.04 && docker tag ccr.ccs.tencentyun.com/cube-studio/nvidia-dcgm-exporter:2.3.1-2.6.1-ubuntu20.04 nvidia/dcgm-exporter:2.3.1-2.6.1-ubuntu20.04 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-minio:RELEASE.2019-08-14T20-37-41Z-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-minio:RELEASE.2019-08-14T20-37-41Z-license-compliance gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-node-exporter:v0.15.2 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-node-exporter:v0.15.2 quay.io/prometheus/node-exporter:v0.15.2 & -docker pull ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-persistenceagent:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-persistenceagent:1.6.0 gcr.io/ml-pipeline/persistenceagent:1.6.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-webhook-manager:v1.4.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-webhook-manager:v1.4.0 volcanosh/vc-webhook-manager:v1.4.0 & docker pull ccr.ccs.tencentyun.com/cube-studio/kubernetesui-metrics-scraper:v1.0.6 && docker tag ccr.ccs.tencentyun.com/cube-studio/kubernetesui-metrics-scraper:v1.0.6 kubernetesui/metrics-scraper:v1.0.6 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-addon-resizer:1.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-addon-resizer:1.0 quay.io/coreos/addon-resizer:1.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.56.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.56.1 quay.io/prometheus-operator/prometheus-operator:v0.56.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/busybox && docker tag ccr.ccs.tencentyun.com/cube-studio/busybox busybox & -docker pull ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator && docker tag ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-state-metrics:v1.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-state-metrics:v1.3.1 quay.io/coreos/kube-state-metrics:v1.3.1 & docker pull ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-scheduler:v1.4.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-scheduler:v1.4.0 volcanosh/vc-scheduler:v1.4.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-frontend:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-frontend:1.6.0 gcr.io/ml-pipeline/frontend:1.6.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-kubernetes-ingress-controller-nginx-ingress-controller:0.30.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-kubernetes-ingress-controller-nginx-ingress-controller:0.30.0 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.46.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.46.0 quay.io/prometheus-operator/prometheus-config-reloader:v0.46.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.56.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.56.1 quay.io/prometheus-operator/prometheus-operator:v0.56.1 & docker pull ccr.ccs.tencentyun.com/cube-studio/alpine:3.10 && docker tag ccr.ccs.tencentyun.com/cube-studio/alpine:3.10 alpine:3.10 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.46.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.46.0 quay.io/prometheus-operator/prometheus-operator:v0.46.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.7.5-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.7.5-license-compliance gcr.io/ml-pipeline/argoexec:v2.7.5-license-compliance & -docker pull ccr.ccs.tencentyun.com/cube-studio/mysql:5.7 && docker tag ccr.ccs.tencentyun.com/cube-studio/mysql:5.7 mysql:5.7 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.56.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-config-reloader:v0.56.1 quay.io/prometheus-operator/prometheus-config-reloader:v0.56.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/kubernetesui-dashboard:v2.2.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/kubernetesui-dashboard:v2.2.0 kubernetesui/dashboard:v2.2.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-addon-resizer:1.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-addon-resizer:1.0 quay.io/coreos/addon-resizer:1.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/k8s.gcr.io-prometheus-adapter-prometheus-adapter:v0.9.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/k8s.gcr.io-prometheus-adapter-prometheus-adapter:v0.9.1 k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/nvidia-k8s-device-plugin:v0.7.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/nvidia-k8s-device-plugin:v0.7.1 nvidia/k8s-device-plugin:v0.7.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-persistenceagent:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-persistenceagent:1.6.0 gcr.io/ml-pipeline/persistenceagent:1.6.0 & docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-alertmanager:v0.15.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-alertmanager:v0.15.0 quay.io/prometheus/alertmanager:v0.15.0 & docker pull ccr.ccs.tencentyun.com/cube-studio/frameworkcontroller-frameworkcontroller && docker tag ccr.ccs.tencentyun.com/cube-studio/frameworkcontroller-frameworkcontroller frameworkcontroller/frameworkcontroller & -docker pull ccr.ccs.tencentyun.com/cube-studio/k8s.gcr.io-prometheus-adapter-prometheus-adapter:v0.9.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/k8s.gcr.io-prometheus-adapter-prometheus-adapter:v0.9.1 k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-visualization-server:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-visualization-server:1.6.0 gcr.io/ml-pipeline/visualization-server:1.6.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-rbac-proxy:v0.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-rbac-proxy:v0.3.1 quay.io/coreos/kube-rbac-proxy:v0.3.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/busybox && docker tag ccr.ccs.tencentyun.com/cube-studio/busybox busybox & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-minio:RELEASE.2019-08-14T20-37-41Z-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-minio:RELEASE.2019-08-14T20-37-41Z-license-compliance gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-frontend:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-frontend:1.6.0 gcr.io/ml-pipeline/frontend:1.6.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-kubernetes-ingress-controller-nginx-ingress-controller:0.30.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-kubernetes-ingress-controller-nginx-ingress-controller:0.30.0 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 & docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-viewer-crd-controller:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-viewer-crd-controller:1.6.0 gcr.io/ml-pipeline/viewer-crd-controller:1.6.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-workflow-controller:v2.12.9-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-workflow-controller:v2.12.9-license-compliance gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-api-server:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-api-server:1.6.0 gcr.io/ml-pipeline/api-server:1.6.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.3.1 quay.io/prometheus/prometheus:v2.3.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-webhook-manager:v1.4.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-webhook-manager:v1.4.0 volcanosh/vc-webhook-manager:v1.4.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/istio-pilot:1.14.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/istio-pilot:1.14.1 istio/pilot:1.14.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/kubernetesui-dashboard:v2.2.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/kubernetesui-dashboard:v2.2.0 kubernetesui/dashboard:v2.2.0 & -docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-spark-operator-spark-operator:v1beta2-1.3.0-3.1.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-spark-operator-spark-operator:v1beta2-1.3.0-3.1.1 gcr.io/spark-operator/spark-operator:v1beta2-1.3.0-3.1.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-scheduledworkflow:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-scheduledworkflow:1.6.0 gcr.io/ml-pipeline/scheduledworkflow:1.6.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.7.5-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.7.5-license-compliance gcr.io/ml-pipeline/argoexec:v2.7.5-license-compliance & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.12.9-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-argoexec:v2.12.9-license-compliance gcr.io/ml-pipeline/argoexec:v2.12.9-license-compliance & +docker pull ccr.ccs.tencentyun.com/cube-studio/mysql:5.7 && docker tag ccr.ccs.tencentyun.com/cube-studio/mysql:5.7 mysql:5.7 & +docker pull ccr.ccs.tencentyun.com/cube-studio/bitnami-redis && docker tag ccr.ccs.tencentyun.com/cube-studio/bitnami-redis bitnami/redis & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-envoy:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-envoy:1.6.0 gcr.io/ml-pipeline/metadata-envoy:1.6.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.46.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-operator-prometheus-operator:v0.46.0 quay.io/prometheus-operator/prometheus-operator:v0.46.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-controller-manager:v1.4.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/volcanosh-vc-controller-manager:v1.4.0 volcanosh/vc-controller-manager:v1.4.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-writer:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-metadata-writer:1.6.0 gcr.io/ml-pipeline/metadata-writer:1.6.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-state-metrics:v1.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-coreos-kube-state-metrics:v1.3.1 quay.io/coreos/kube-state-metrics:v1.3.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/nvidia-dcgm-exporter:2.3.1-2.6.1-ubuntu20.04 && docker tag ccr.ccs.tencentyun.com/cube-studio/nvidia-dcgm-exporter:2.3.1-2.6.1-ubuntu20.04 nvidia/dcgm-exporter:2.3.1-2.6.1-ubuntu20.04 & docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.27.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.27.1 quay.io/prometheus/prometheus:v2.27.1 & -docker pull ccr.ccs.tencentyun.com/cube-studio/nvidia-k8s-device-plugin:v0.7.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/nvidia-k8s-device-plugin:v0.7.1 nvidia/k8s-device-plugin:v0.7.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.3.1 quay.io/prometheus/prometheus:v2.3.1 & +docker pull ccr.ccs.tencentyun.com/cube-studio/kubesigs-kube-batch:v0.5 && docker tag ccr.ccs.tencentyun.com/cube-studio/kubesigs-kube-batch:v0.5 kubesigs/kube-batch:v0.5 & +docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-node-exporter:v0.15.2 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-node-exporter:v0.15.2 quay.io/prometheus/node-exporter:v0.15.2 & +docker pull ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:7.5.2 && docker tag ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:7.5.2 grafana/grafana:7.5.2 & +docker pull ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator && docker tag ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator & +docker pull ccr.ccs.tencentyun.com/cube-studio/metacontroller-metacontroller:v0.3.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/metacontroller-metacontroller:v0.3.0 metacontroller/metacontroller:v0.3.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-workflow-controller:v2.12.9-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-workflow-controller:v2.12.9-license-compliance gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-tfx-oss-public-ml_metadata_store_server:0.30.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-tfx-oss-public-ml_metadata_store_server:0.30.0 gcr.io/tfx-oss-public/ml_metadata_store_server:0.30.0 & +docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-api-server:1.6.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-api-server:1.6.0 gcr.io/ml-pipeline/api-server:1.6.0 & wait diff --git a/install/kubernetes/spark/install.yaml b/install/kubernetes/spark/install.yaml index 899c5915..7b3f32b3 100644 --- a/install/kubernetes/spark/install.yaml +++ b/install/kubernetes/spark/install.yaml @@ -4517,7 +4517,7 @@ spec: {} containers: - name: spark-operator - image: gcr.io/spark-operator/spark-operator:v1beta2-1.3.0-3.1.1 + image: ccr.ccs.tencentyun.com/cube-studio/spark-operator:v1beta2-1.3.7-3.1.1 imagePullPolicy: IfNotPresent securityContext: {} diff --git a/myapp/init-job-template.json b/myapp/init-job-template.json index 54df8799..402b9ac1 100644 --- a/myapp/init-job-template.json +++ b/myapp/init-job-template.json @@ -228,7 +228,7 @@ "type":"str", "item_type":"str", "label":"每个worker的初始化脚本文件地址，用来安装环境", - "require":1, + "require":0, "choice":[ ], "range":"", @@ -328,7 +328,7 @@ "type": "str", "item_type": "str", "label": "Java/Scala类名", - "require": 1, + "require": 0, "choice": [], "range": "", "default": "", @@ -356,7 +356,7 @@ "type": "str", "item_type": "str", "label": "代码参数", - "require": 1, + "require": 0, "choice": [], "range": "", "default": "", @@ -370,7 +370,7 @@ "type": "text", "item_type": "str", "label": "spark配置", - "require": 1, + "require": 0, "choice": [], "range": "", "default": "", @@ -384,7 +384,7 @@ "type": "text", "item_type": "str", "label": "hadoop配置，每行一个配置，xx=yy", - "require": 1, + "require": 0, "choice": [], "range": "", "default": "", @@ -1766,7 +1766,7 @@ "type":"str", "item_type":"str", "label":"中文描述描述", - "require":0, + "require":1, "choice":[ ], @@ -1784,7 +1784,7 @@ "type":"str", "item_type":"str", "label":"模型名", - "require":0, + "require":1, "choice":[ ], @@ -1802,7 +1802,7 @@ "type":"str", "item_type":"str", "label":"模型版本号", - "require":0, + "require":1, "choice":[ ], @@ -1840,7 +1840,7 @@ "type":"str", "item_type":"str", "label":"推理服务类型", - "require":0, + "require":1, "choice":[ "serving", "tfserving", @@ -1862,7 +1862,7 @@ "type":"str", "item_type":"str", "label":"推理服务镜像", - "require":0, + "require":1, "choice":[ ], @@ -1885,9 +1885,9 @@ ], "range":"", - "default":"/mnt/xx", + "default":"", "placeholder":"", - "describe":"推理容器工作目录", + "describe":"推理容器工作目录,个人工作目录/mnt/$username", "editable":1, "condition":"", "sub_args":{ @@ -1970,7 +1970,7 @@ "type":"str", "item_type":"str", "label":"pod副本数", - "require":0, + "require":1, "choice":[ ], @@ -1988,7 +1988,7 @@ "type":"str", "item_type":"str", "label":"每个pod占用内存", - "require":0, + "require":1, "choice":[ ], @@ -2006,7 +2006,7 @@ "type":"str", "item_type":"str", "label":"每个pod占用cpu", - "require":0, + "require":1, "choice":[ ], @@ -2024,7 +2024,7 @@ "type":"str", "item_type":"str", "label":"每个pod占用gpu", - "require":0, + "require":1, "choice":[ ],