Skip to content

Add NODE_SELECTOR_VALUE for custom node selection. #26

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

Open
drogers-wish wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add NODE_SELECTOR_VALUE for custom node selection. #26

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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WORKDIR /go/src/github.com/wish/kcd
RUN export GO111MODULE=on && GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/kcd

#Actual Image
FROM alpine:3.13.0
FROM alpine:3.13

VOLUME /go/src

Expand Down
10 changes: 9 additions & 1 deletion service/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,10 @@ func (c *CVController) newKCDSyncDeployment(kcd *kcd1.KCD, version string) *apps
// for new stage env, it should be node.wish.com/instancegroup from environment variable NODE_SELECTOR
nodeSelector := getEnv("NODE_SELECTOR", "kops.k8s.io/instancegroup")
glog.V(1).Info("Getting node selector label=%s", nodeSelector)

// default value: kcd
nodeSelectorValue := getEnv("NODE_SELECTOR_VALUE", "kcd")
glog.V(1).Info("Getting node selector value=%s", nodeSelectorValue)

return &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -457,6 +461,10 @@ func (c *CVController) newKCDSyncDeployment(kcd *kcd1.KCD, version string) *apps
Name: "NODE_SELECTOR",
Value: nodeSelector,
},
{
Name: "NODE_SELECTOR_VALUE",
Value: nodeSelectorValue,
},
},
LivenessProbe: &corev1.Probe{
PeriodSeconds: int32(livenessSeconds),
Expand All @@ -478,7 +486,7 @@ func (c *CVController) newKCDSyncDeployment(kcd *kcd1.KCD, version string) *apps
},
},
NodeSelector: map[string]string{
nodeSelector: "kcd",
nodeSelector: nodeSelectorValue,
},
},
},
Expand Down