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.

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

*: remove the old installer code #342

Merged
merged 7 commits into from
Sep 28, 2018
Merged

*: remove the old installer code #342

merged 7 commits into from
Sep 28, 2018

Conversation

crawford
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 26, 2018
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 26, 2018
@crawford
Copy link
Contributor Author

/hold

Waiting on CI to be merged.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 26, 2018
@crawford
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2018
@wking
Copy link
Member

wking commented Sep 28, 2018

conflicts ;)

@wking wking mentioned this pull request Sep 28, 2018
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 28, 2018
This removes all of the files which are directly required by bazel.
The installer no longer reads Ignition files or the CA from disk, so
these aren't needed.
The installer package is going to be removed. This moves the remaining
validation functionality.
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 28, 2018
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 28, 2018

@crawford: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/build-tarball e22d07eefcdee905ddcf37e275bd20d5568dfa37 link /test build-tarball
ci/prow/e2e-aws-smoke e22d07eefcdee905ddcf37e275bd20d5568dfa37 link /test e2e-aws-smoke

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@wking
Copy link
Member

wking commented Sep 28, 2018

More to get when you rebase:

$ git grep -i bazel | cat
.gitignore:# non-default Bazel stuff
.gitignore:# Created by https://www.gitignore.io/api/go,bazel,terraform
.gitignore:### Bazel ###
.gitignore:/bazel-*
.gitignore:# End of https://www.gitignore.io/api/go,bazel,terraform
CONTRIBUTING.md:    hack/test-bazel-build-tarball.sh
docs/design/assetgeneration.md:The installer internally uses a directed acyclic graph to represent all of the assets it creates as well as their dependencies. This process looks very similar to many build systems (e.g. Bazel, Make).
docs/dev/libvirt-howto.md:bazel build tarball
docs/dev/libvirt-howto.md:tar -zxf bazel-bin/tectonic-dev.tar.gz
hack/test-bazel-build-tarball.sh:  bazel --output_base=/tmp build "$@" tarball
hack/test-bazel-build-tarball.sh:    quay.io/coreos/tectonic-builder:bazel-v0.3 \
hack/test-bazel-build-tarball.sh:    ./hack/test-bazel-build-tarball.sh
images/installer-origin-release/Dockerfile.ci:FROM  openshift/origin-release:bazel
images/installer-origin-release/Dockerfile.ci:ENV USER="bazel"
images/installer-origin-release/Dockerfile.ci:RUN bazel --output_base=/tmp build smoke_tests && \
images/installer-origin-release/Dockerfile.ci:    cp bazel-bin/tests/smoke/linux_amd64_pure_stripped/go_default_test /usr/bin/smoke && \
images/installer-origin-release/Dockerfile.ci:    bazel clean
images/tectonic-installer/Dockerfile:# from bazel-bin/tectonic.tar.gz to the docker build context folder of your
pkg/terraform/terraform.go:// TODO(yifan): Get rid of this when moving off building with bazel.
tests/run.sh:bazel build tarball smoke_tests
tests/run.sh:# In future bazel build could be extracted to another job which could be running in docker container like this:
tests/run.sh:# docker run --rm -v $PWD:$PWD:Z -w $PWD quay.io/coreos/tectonic-builder:bazel-v0.3 bazel build tarball smoke_tests
tests/run.sh:tar -zxf bazel-bin/tectonic-dev.tar.gz
tests/run.sh:cp bazel-bin/tests/smoke/linux_amd64_pure_stripped/go_default_test tectonic-dev/smoke
tests/smoke/README.md:bazel build smoke_tests
tests/smoke/README.md:The tests can then be run by invoking the `go_default_test` binary in the `bazel-bin/tests/smoke/linux_amd64_pure_stripped` directory.
tests/smoke/README.md:bazel-bin/tests/smoke/linux_amd64_pure_stripped/go_default_test -cluster -test.v

.gitignore, CONTRIBUTING.md, and hack/test-bazel-build-tarball.sh seem like low-hanging fruit. I've got the images/ stuff in flight with #363 and the pkg/terraform TODO with #362. I'm fine punting docs/ and tests/ to future cleanup.

This is the last of the old installer code. It's no longer used and can
be removed.
After removing the installer code, these dependencies were removed by
glide.
These were used by the old installer, which has now been deleted.
Rather than just checking the old directories, we'd might as well test
the entire repository. This also updates all of the yaml files, making
them more readable, in my opinion.
@crawford
Copy link
Contributor Author

@wking Added your suggestions (leaving off the things you have in flight).

@wking
Copy link
Member

wking commented Sep 28, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit f135d86 into openshift:master Sep 28, 2018
@crawford crawford deleted the purge branch September 28, 2018 06:47
wking added a commit to wking/openshift-installer that referenced this pull request Sep 28, 2018
Generated with:

  $ glide remove github.com/AlecAivazis/survey
  $ glide get --strip-vendor gopkg.in/AlecAivazis/survey
  [INFO]Preparing to install 1 package.
  [INFO]Attempting to get package gopkg.in/AlecAivazis/survey.v1
  [INFO]--> Gathering release information for gopkg.in/AlecAivazis/survey.v1
  [INFO]The package gopkg.in/AlecAivazis/survey.v1 appears to have Semantic Version releases (http://semver.org).
  [INFO]The latest release is v1.6.2. You are currently not using a release. Would you like
  [INFO]to use this release? Yes (Y) or No (N)
  y
  [INFO]The package gopkg.in/AlecAivazis/survey.v1 appears to use semantic versions (http://semver.org).
  [INFO]Would you like to track the latest minor or patch releases (major.minor.patch)?
  [INFO]The choices are:
  [INFO] - Tracking minor version releases would use '>= 1.6.2, < 2.0.0' ('^1.6.2')
  [INFO] - Tracking patch version releases would use '>= 1.6.2, < 1.7.0' ('~1.6.2')
  [INFO] - Skip using ranges
  [INFO]For more information on Glide versions and ranges see https://glide.sh/docs/versions
  [INFO]Minor (M), Patch (P), or Skip Ranges (S)?
  m
  [INFO]--> Adding gopkg.in/AlecAivazis/survey.v1 to your configuration with the version ^1.6.2
  ...
  $ glide-vc --use-lock-file --no-tests --only-code
  $ git checkout HEAD -- vendor/github.com/shurcooL/httpfs

using:

  $ glide --version
  glide version 0.13.2-dev
  $ (cd $GOPATH/src/github.com/Masterminds/glide && git describe)
  v0.13.1-7-g3e13fd1
  $ (cd $GOPATH/src/github.com/sgotti/glide-vc && git describe)
  v0.1.0-2-g6ddf6ee

The httpfs works around our busted vfsutil vendor, see
a8cce08 (vendor: Add shurcooL/httpfs/vfsutil, 2018-09-26, openshift#340).

The formatting change unwinds ff9e547 (*: format all yaml files,
2018-09-27, openshift#342), but it doesn't seem to be worth fighting Glide on
this front.
wking added a commit to wking/openshift-installer that referenced this pull request Sep 28, 2018
Catching up with 0c6d53b (*: remove bazel, 2018-09-24, openshift#342).
wking added a commit to wking/openshift-installer that referenced this pull request Oct 4, 2018
With openshift-install, the config type is a one-way map from
InstallConfig to Terraform, so we can drop these methods.  The last
consumers were removed in b6c0d8c (installer: remove package,
2018-09-26, openshift#342).
wking added a commit to wking/openshift-installer that referenced this pull request Oct 20, 2018
These escaped the great purge of 0c6d53b (*: remove bazel,
2018-09-24, openshift#342).  kubernetes/BUILD.bazel snuck in with 70ea0e8
(tests/smoke/vendor: switch from glide to dep, 2018-09-28, openshift#380), and
tectonic/BUILD.bazel snuck in with e2d9fd3 (manifests: make tectonic/
flat dir, 2018-09-25, openshift#330).  I'd guess both were due to rebases from
commits originally made before openshift#342 landed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants