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.

Sign up for GitHub

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

Jump to bottom

Update vk- to vc- #312

Merged
merged 1 commit into from
Jul 9, 2019
Merged

Update vk- to vc- #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ LD_FLAGS=" \

.EXPORT_ALL_VARIABLES:

all: kube-batch vk-controllers vk-admission vkctl
all: kube-batch vc-controllers vc-admission vkctl

init:
mkdir -p ${BIN_DIR}

kube-batch: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-kube-batch ./cmd/kube-batch
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-kube-batch ./cmd/kube-batch

vk-controllers: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-controllers ./cmd/controllers
vc-controllers: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controllers ./cmd/controllers

vk-admission: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-admission ./cmd/admission
vc-admission: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-admission ./cmd/admission

vkctl: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vkctl ./cmd/cli
Expand All @@ -34,14 +34,14 @@ image_bins:
go get github.com/mitchellh/gox
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vkctl ./cmd/cli
for name in controllers kube-batch admission; do\
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./cmd/$$name; \
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 kube-batch admission; do\
cp ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./installer/dockerfile/$$name/; \
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/vk-$$name; \
rm installer/dockerfile/$$name/vc-$$name; \
done

admission-base-image:
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ make images
## Verify your images
# docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
volcanosh/vk-admission latest a83338506638 8 seconds ago 41.4MB
volcanosh/vk-kube-batch latest faa3c2a25ac3 9 seconds ago 49.6MB
volcanosh/vk-controllers latest 7b11606ebfb8 10 seconds ago 44.2MB
volcanosh/vc-admission latest a83338506638 8 seconds ago 41.4MB
volcanosh/vc-kube-batch latest faa3c2a25ac3 9 seconds ago 49.6MB
volcanosh/vc-controllers latest 7b11606ebfb8 10 seconds ago 44.2MB

```

Expand Down
4 changes: 2 additions & 2 deletions cmd/controllers/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,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: "vk-controllers"})
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controllers"})

hostname, err := os.Hostname()
if err != nil {
Expand All @@ -120,7 +120,7 @@ func Run(opt *options.ServerOption) error {

rl, err := resourcelock.New(resourcelock.ConfigMapsResourceLock,
opt.LockObjectNamespace,
"vk-controllers",
"vc-controllers",
leaderElectionClient.CoreV1(),
resourcelock.ResourceLockConfig{
Identity: id,
Expand Down
4 changes: 2 additions & 2 deletions installer/dockerfile/admission/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
# since the required packages change very rarely.
FROM volcanosh/vk-admission-base:latest

ADD vk-admission /vk-admission
ADD vc-admission /vc-admission
ADD gen-admission-secret.sh /gen-admission-secret.sh
ENTRYPOINT ["/vk-admission"]
ENTRYPOINT ["/vc-admission"]
4 changes: 2 additions & 2 deletions installer/dockerfile/controllers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

FROM alpine:latest

ADD vk-controllers /vk-controllers
ENTRYPOINT ["/vk-controllers"]
ADD vc-controllers /vc-controllers
ENTRYPOINT ["/vc-controllers"]
4 changes: 2 additions & 2 deletions installer/dockerfile/kube-batch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

FROM alpine:latest

ADD vk-kube-batch /vk-kube-batch
ENTRYPOINT ["/vk-kube-batch"]
ADD vc-kube-batch /vc-kube-batch
ENTRYPOINT ["/vc-kube-batch"]
2 changes: 1 addition & 1 deletion pkg/controllers/job/job_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func NewJobController(
eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(glog.Infof)
eventBroadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
recorder := eventBroadcaster.NewRecorder(vkscheme.Scheme, v1.EventSource{Component: "vk-controller"})
recorder := eventBroadcaster.NewRecorder(vkscheme.Scheme, v1.EventSource{Component: "vc-controller"})

cc := &Controller{
kubeClients: kubeClient,
Expand Down