volcano-sh
/
volcano
mirror of https://github.com/volcano-sh/volcano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #605 from k82cn/rename_bins 

Rename binaries.
This commit is contained in:
Volcano Bot 2019-12-20 13:56:17 +08:00 committed by GitHub
parent 072ae08c3a 61cfd22754
commit 8d8293772d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -23,7 +23,7 @@ include Makefile.def
.EXPORT_ALL_VARIABLES:
all: vc-scheduler vc-controllers vc-admission vcctl
all: vc-scheduler vc-controller-manager vc-webhook-manager vcctl
init:
mkdir -p ${BIN_DIR}
@ -32,11 +32,11 @@ init:
vc-scheduler: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-scheduler ./cmd/scheduler
vc-controllers: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controllers ./cmd/controllers
vc-controller-manager: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controller-manager ./cmd/controller-manager
vc-admission: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-admission ./cmd/admission
vc-webhook-manager: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-webhook-manager ./cmd/webhook-manager
vcctl: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vcctl ./cmd/cli
@ -44,19 +44,19 @@ vcctl: init
image_bins: init
go get github.com/mitchellh/gox
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vcctl ./cmd/cli
for name in controllers scheduler admission; do\
for name in controller-manager scheduler webhook-manager; do\
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./cmd/$$name; \
done
images: image_bins
for name in controllers scheduler admission; do\
for name in controller-manager scheduler webhook-manager; do\
cp ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./installer/dockerfile/$$name/; \
docker build --no-cache -t $(IMAGE_PREFIX)-$$name:$(TAG) ./installer/dockerfile/$$name; \
rm installer/dockerfile/$$name/vc-$$name; \
done
admission-base-image:
docker build --no-cache -t $(IMAGE_PREFIX)-admission-base:$(TAG) ./installer/dockerfile/admission/ -f ./installer/dockerfile/admission/Dockerfile.base;
webhook-manager-base-image:
docker build --no-cache -t $(IMAGE_PREFIX)-webhook-manager-base:$(TAG) ./installer/dockerfile/webhook-manager/ -f ./installer/dockerfile/webhook-manager/Dockerfile.base;
generate-code:
./hack/update-gencode.sh

2
cmd/controllers/app/options/options.go → cmd/controller-manager/app/options/options.go
View File

@ -60,7 +60,7 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.Master, "master", s.Master, "The address of the Kubernetes API server (overrides any value in kubeconfig)")
fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information.")
fs.BoolVar(&s.EnableLeaderElection, "leader-elect", s.EnableLeaderElection, "Start a leader election client and gain leadership before "+
"executing the main loop. Enable this when running replicated vc-controllers for high availability.")
"executing the main loop. Enable this when running replicated vc-controller-manager for high availability.")
fs.StringVar(&s.LockObjectNamespace, "lock-object-namespace", s.LockObjectNamespace, "Define the namespace of the lock object.")
fs.Float32Var(&s.KubeAPIQPS, "kube-api-qps", defaultQPS, "QPS to use while talking with kubernetes apiserver")
fs.IntVar(&s.KubeAPIBurst, "kube-api-burst", defaultBurst, "Burst to use while talking with kubernetes apiserver")

0
cmd/controllers/app/options/options_test.go → cmd/controller-manager/app/options/options_test.go
View File

6
cmd/controllers/app/server.go → cmd/controller-manager/app/server.go
View File

@ -39,7 +39,7 @@ import (
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record"
"volcano.sh/volcano/cmd/controllers/app/options"
"volcano.sh/volcano/cmd/controller-manager/app/options"
"volcano.sh/volcano/pkg/apis/helpers"
vcclientset "volcano.sh/volcano/pkg/client/clientset/versioned"
"volcano.sh/volcano/pkg/controllers/garbagecollector"
@ -100,7 +100,7 @@ func Run(opt *options.ServerOption) error {
// Prepare event clients.
broadcaster := record.NewBroadcaster()
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: leaderElectionClient.CoreV1().Events(opt.LockObjectNamespace)})
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controllers"})
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controller-manager"})
hostname, err := os.Hostname()
if err != nil {
@ -111,7 +111,7 @@ func Run(opt *options.ServerOption) error {
rl, err := resourcelock.New(resourcelock.ConfigMapsResourceLock,
opt.LockObjectNamespace,
"vc-controllers",
"vc-controller-manager",
leaderElectionClient.CoreV1(),
resourcelock.ResourceLockConfig{
Identity: id,

4
cmd/controllers/main.go → cmd/controller-manager/main.go
View File

@ -27,8 +27,8 @@ import (
"k8s.io/apiserver/pkg/util/flag"
"k8s.io/klog"
"volcano.sh/volcano/cmd/controllers/app"
"volcano.sh/volcano/cmd/controllers/app/options"
"volcano.sh/volcano/cmd/controller-manager/app"
"volcano.sh/volcano/cmd/controller-manager/app/options"
"volcano.sh/volcano/pkg/version"
)

0
cmd/admission/app/options/options.go → cmd/webhook-manager/app/options/options.go
View File

2
cmd/admission/app/server.go → cmd/webhook-manager/app/server.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog"
"volcano.sh/volcano/cmd/admission/app/options"
"volcano.sh/volcano/cmd/webhook-manager/app/options"
"volcano.sh/volcano/pkg/admission/router"
"volcano.sh/volcano/pkg/version"
)

2
cmd/admission/app/util.go → cmd/webhook-manager/app/util.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/klog"
"volcano.sh/volcano/cmd/admission/app/options"
"volcano.sh/volcano/cmd/webhook-manager/app/options"
"volcano.sh/volcano/pkg/admission/router"
"volcano.sh/volcano/pkg/client/clientset/versioned"
)

4
cmd/admission/main.go → cmd/webhook-manager/main.go
View File

@ -27,8 +27,8 @@ import (
"k8s.io/apiserver/pkg/util/flag"
"k8s.io/klog"
"volcano.sh/volcano/cmd/admission/app"
"volcano.sh/volcano/cmd/admission/app/options"
"volcano.sh/volcano/cmd/webhook-manager/app"
"volcano.sh/volcano/cmd/webhook-manager/app/options"
_ "volcano.sh/volcano/pkg/admission/jobs/mutate"
_ "volcano.sh/volcano/pkg/admission/jobs/validate"

6
docs/development/development.md
View File

@ -53,7 +53,7 @@ make images
## Building a specific docker image
If you want to make a local change and test some component, say `vc-controllers`, you
If you want to make a local change and test some component, say `vc-controller-manager`, you
could do:
Under volcano.sh/volcano repo
@ -73,10 +73,10 @@ export HUB=docker.io/yourrepo
export TAG=citadel
```
Make some local change of the code, then build `vc-controllers`
Make some local change of the code, then build `vc-controller-manager`
```bash
make image.vc-controllers
make image.vc-controller-manager
```
## Building the Volcano manifests

4
hack/lib/install.sh
View File

@ -21,9 +21,9 @@ function kind-up-cluster {
kind create cluster ${CLUSTER_CONTEXT} ${KIND_OPT}
echo "Loading docker images into kind cluster"
kind load docker-image ${IMAGE_PREFIX}-controllers:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-controller-manager:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-scheduler:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-admission:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-webhook-manager:${TAG} ${CLUSTER_CONTEXT}
}

10
hack/local-up-cluster.sh
View File

@ -127,10 +127,10 @@ function start_apiserver {
}
function start_controller_manager {
nohup ${VC_HOME}/_output/bin/vc-controllers \
nohup ${VC_HOME}/_output/bin/vc-controller-manager \
--v=3 \
--logtostderr=false \
--log-file=${VC_HOME}/volcano/logs/vc-controllers.log \
--log-file=${VC_HOME}/volcano/logs/vc-controller-manager.log \
--scheduler-name=default-scheduler \
--kubeconfig=${VC_HOME}/volcano/config/controller-manager.config &
@ -190,10 +190,10 @@ function start_volcano_scheduler {
}
function start_volcano_admission {
nohup ${VC_HOME}/_output/bin/vc-admission \
nohup ${VC_HOME}/_output/bin/vc-webhook-manager \
-v 3 \
--logtostderr=false \
--log-file=${VC_HOME}/volcano/logs/vc-admission.log \
--log-file=${VC_HOME}/volcano/logs/vc-webhook-manager.log \
--ca-cert-file ${CERT_DIR}/root.pem \
--scheduler-name=default-scheduler \
--kubeconfig ${VC_HOME}/volcano/config/admin.config \
@ -203,7 +203,7 @@ function start_volcano_admission {
}
function cleanup_cluster {
killall -9 etcd kube-apiserver kube-controller-manager kubelet vc-controllers vc-scheduler vc-admission
killall -9 etcd kube-apiserver kube-controller-manager kubelet vc-controller-manager vc-scheduler vc-webhook-manager
rm -rf ${VC_HOME}/volcano
# Waiting for TIME_WAIT

10
hack/publish.sh
View File

@ -65,10 +65,18 @@ if [[ "${DOCKER_USERNAME}xxx" == "xxx" ]];then
fi
echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
echo "pushing ${IMAGE_PREFIX}-controllers:${VOLCANO_IMAGE_TAG}"
echo "pushing ${IMAGE_PREFIX}-controller-manager:${VOLCANO_IMAGE_TAG}"
docker tag ${IMAGE_PREFIX}-controller-manager:${VOLCANO_IMAGE_TAG} ${IMAGE_PREFIX}-controllers:${VOLCANO_IMAGE_TAG}
docker push ${IMAGE_PREFIX}-controllers:${VOLCANO_IMAGE_TAG}
docker push ${IMAGE_PREFIX}-controller-manager:${VOLCANO_IMAGE_TAG}
echo "pushing ${IMAGE_PREFIX}-scheduler:${VOLCANO_IMAGE_TAG}"
docker push ${IMAGE_PREFIX}-scheduler:${VOLCANO_IMAGE_TAG}
echo "pushing ${IMAGE_PREFIX}-webhook-manager:${VOLCANO_IMAGE_TAG}"
docker tag ${IMAGE_PREFIX}-webhook-manager:${VOLCANO_IMAGE_TAG} ${IMAGE_PREFIX}-admission:${VOLCANO_IMAGE_TAG}
docker push ${IMAGE_PREFIX}-admission:${VOLCANO_IMAGE_TAG}
docker push ${IMAGE_PREFIX}-webhook-manager:${VOLCANO_IMAGE_TAG}
echo "Generate release tar files"
cd ${RELEASE_FOLDER}/

4
installer/README.md
View File

@ -69,9 +69,9 @@ The following are the list configurable parameters of Volcano Chart and their de
| Parameter|Description|Default Value|
|----------------|-----------------|----------------------|
|`basic.image_tag_version`| Docker image version Tag | `latest`|
|`basic.controller_image_name`|Controller Docker Image Name|`volcanosh/vc-controllers`|
|`basic.controller_image_name`|Controller Docker Image Name|`volcanosh/vc-controller-manager`|
|`basic.scheduler_image_name`|Scheduler Docker Image Name|`volcanosh/vc-scheduler`|
|`basic.admission_image_name`|Admission Controller Image Name|`volcanosh/vc-admission`|
|`basic.admission_image_name`|Admission Controller Image Name|`volcanosh/vc-webhook-manager`|
|`basic.admission_secret_name`|Volcano Admission Secret Name|`volcano-admission-secret`|
|`basic.scheduler_config_file`|Configuration File name for Scheduler|`config/volcano-scheduler.conf`|
|`basic.image_pull_secret`|Image Pull Secret|`""`|

4
installer/dockerfile/controllers/Dockerfile → installer/dockerfile/controller-manager/Dockerfile
View File

@ -15,5 +15,5 @@
FROM alpine:latest
ADD vc-controllers /vc-controllers
ENTRYPOINT ["/vc-controllers"]
ADD vc-controller-manager /vc-controller-manager
ENTRYPOINT ["/vc-controller-manager"]

6
installer/dockerfile/admission/Dockerfile → installer/dockerfile/webhook-manager/Dockerfile
View File

@ -15,8 +15,8 @@
# The base image is created via `Dockerfile.base`, the base image is cached
# since the required packages change very rarely.
FROM volcanosh/vk-admission-base:latest
FROM volcanosh/vc-webhook-manager-base:1.3.1
ADD vc-admission /vc-admission
ADD vc-webhook-manager /vc-webhook-manager
ADD gen-admission-secret.sh /gen-admission-secret.sh
ENTRYPOINT ["/vc-admission"]
ENTRYPOINT ["/vc-webhook-manager"]

0
installer/dockerfile/admission/Dockerfile.base → installer/dockerfile/webhook-manager/Dockerfile.base
View File

0
installer/dockerfile/admission/gen-admission-secret.sh → installer/dockerfile/webhook-manager/gen-admission-secret.sh
View File

4
installer/helm/chart/volcano/values.yaml
View File

@ -1,8 +1,8 @@
basic:
image_tag_version: "latest"
controller_image_name: "volcanosh/vc-controllers"
controller_image_name: "volcanosh/vc-controller-manager"
scheduler_image_name: "volcanosh/vc-scheduler"
admission_image_name: "volcanosh/vc-admission"
admission_image_name: "volcanosh/vc-webhook-manager"
admission_secret_name: "volcano-admission-secret"
scheduler_config_file: "config/volcano-scheduler.conf"
image_pull_secret: ""

6
installer/volcano-development.yaml
View File

@ -220,7 +220,7 @@ spec:
- --port=443
- -v=4
- 2>&1
image: volcanosh/vc-admission:latest
image: volcanosh/vc-webhook-manager:latest
imagePullPolicy: IfNotPresent
name: admission
volumeMounts:
@ -266,7 +266,7 @@ spec:
restartPolicy: Never
containers:
- name: main
image: volcanosh/vc-admission:latest
image: volcanosh/vc-webhook-manager:latest
imagePullPolicy: IfNotPresent
command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
"volcano-system", "--secret", "volcano-admission-secret"]
@ -364,7 +364,7 @@ spec:
containers:
- name: volcano-controllers
image: volcanosh/vc-controllers:latest
image: volcanosh/vc-controller-manager:latest
args:
- --alsologtostderr
- -v=4

2
pkg/controllers/job/job_controller.go
View File

@ -126,7 +126,7 @@ func NewJobController(
eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(klog.Infof)
eventBroadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
recorder := eventBroadcaster.NewRecorder(vcscheme.Scheme, v1.EventSource{Component: "vc-controllers"})
recorder := eventBroadcaster.NewRecorder(vcscheme.Scheme, v1.EventSource{Component: "vc-controller-manager"})
cc := &Controller{
kubeClient: kubeClient,

2
pkg/controllers/queue/queue_controller.go
View File

@ -120,7 +120,7 @@ func NewQueueController(
podGroups: make(map[string]map[string]struct{}),
recorder: eventBroadcaster.NewRecorder(versionedscheme.Scheme, v1.EventSource{Component: "vc-controllers"}),
recorder: eventBroadcaster.NewRecorder(versionedscheme.Scheme, v1.EventSource{Component: "vc-controller-manager"}),
}
queueInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{