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

Fix cluster-capacity functionality as a pod. #18198

Merged
merged 1 commit into from
Jan 24, 2018
Merged

Fix cluster-capacity functionality as a pod. #18198

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
3 changes: 1 addition & 2 deletions cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@

FROM golang:latest

MAINTAINER Dominika Hodovska <dhodovsk@redhat.com>
MAINTAINER Avesh Agarwal <avagarwa@redhat.com>

COPY hypercc /bin/hypercc
RUN ln -sf /bin/hypercc /bin/cluster-capacity
RUN ln -sf /bin/hypercc /bin/genpod
COPY config/default-scheduler.yaml /config/default-scheduler.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we not need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is used when a customized scheduler config is passed, which should be done via configmap.

Copy link
Contributor Author

@aveshagarwal aveshagarwal Jan 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to hard code or embed in the image.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we document where this configmap should be mounted inside the container?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In https://docs.openshift.com/container-platform/3.7/admin_guide/cluster_capacity.html, we have documented how to mount pod spec via configmap but not customized scheduler config as mostly one does not need that. That said, the above documented can be updated with description about how to mount scheduler config as a ConfigMap in a pod.

CMD ["/bin/cluster-capacity --help"]
10 changes: 7 additions & 3 deletions ...hub.com/kubernetes-incubator/cluster-capacity/cmd/cluster-capacity/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,14 @@ func (s *ClusterCapacityConfig) parseSchedulerConfig(path string) (*schedapp.Sch
decoder.Decode(ksConfig)
}

// In a POD, master is passed as empty string.
var master string
master, err = utils.GetMasterFromKubeConfig(s.Options.Kubeconfig)
if err != nil {
return nil, err
_, present := os.LookupEnv("CC_INCLUSTER")
if !present {
master, err = utils.GetMasterFromKubeConfig(s.Options.Kubeconfig)
if err != nil {
return nil, err
}
}

// TODO(avesh): need to check if this works correctly
Expand Down
2 changes: 1 addition & 1 deletion ...o/src/github.com/kubernetes-incubator/cluster-capacity/cmd/cluster-capacity/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func Run(opt *options.ClusterCapacityOptions) error {

err := conf.SetDefaultScheduler()
if err != nil {
return fmt.Errorf("Failed to set default scheduler config: %v ", err)
return fmt.Errorf("Failed to create default scheduler server: %v ", err)
}

// TODO (avesh): Enable when support for multiple schedulers is implemented.
Expand Down
2 changes: 1 addition & 1 deletion ...uster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/pkg/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func PrintPod(pod *v1.Pod, format string) error {
func GetMasterFromKubeConfig(filename string) (string, error) {
config, err := clientcmd.LoadFromFile(filename)
if err != nil {
return "", err
return "", fmt.Errorf("can not load kubeconfig file: %v", err)
}

context, ok := config.Contexts[config.CurrentContext]
Expand Down