Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

[COPS-3443] Make default docker image the one in resource.json #384

Merged
merged 2 commits into from
Jul 20, 2018

Conversation

elezar
Copy link
Contributor

@elezar elezar commented Jul 18, 2018

Specifying the default docker image twice means that the default installation doesn't work on local universes.

This change removes the default from config.json which makes the value specified in resource.json the default. This does not change behaviour, but makes it easier to use Spark from a local universe.

The alternative would be extensive documentation changes.

@elezar elezar requested a review from susanxhuynh July 18, 2018 08:41
@elezar elezar self-assigned this Jul 18, 2018
@mpereira
Copy link
Contributor

Is {{ docker-image }} in resource.json interpolated to a value that is compatible with local universes?

@elezar
Copy link
Contributor Author

elezar commented Jul 18, 2018

Is {{ docker-image }} in resource.json interpolated to a value that is compatible with local universes?

For the versions we release, this is mesosphere/spark (see: https://github.com/mesosphere/universe/blob/version-3.x/repo/packages/S/spark/200/resource.json#L5) and is populated at build time. The difference is that when building a local universe certain URIs and containers are updated in the resource.json and these are used instead.

@mpereira
Copy link
Contributor

Gotcha.

@elezar elezar requested a review from samvantran July 19, 2018 08:45
Copy link
Contributor

@samvantran samvantran left a comment

Choose a reason for hiding this comment

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

Looks good to me !

@elezar elezar merged commit 773a91f into master Jul 20, 2018
@elezar elezar deleted the COPS-3443-make-default-docker-image-resource-json branch July 20, 2018 20:55
elezar pushed a commit that referenced this pull request Jul 25, 2018
…385)

## Release Notes
* Ensure that default settings allow deployment in an air-gapped cluster.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants