Skip to content

Commit 863a1ec

Browse files
wkingcrawford
authored andcommitted
hack/get-terraform: Remove obsolete script
Now that we're vendoring Terraform, we no longer need a script to pull down pre-compiled binaries. I've also reworded the 'create cluster' description in overview.md to be more generic. See 0c3d8658 (asset/cluster: clean up logging messages, 2018-12-07, #840) for similar changes to another location.
1 parent f21718e commit 863a1ec

File tree

5 files changed

+3
-41
lines changed

5 files changed

+3
-41
lines changed

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ This will create `bin/openshift-install`. This binary can then be invoked to cre
2222
bin/openshift-install create cluster
2323
```
2424

25-
The installer requires the terraform binary either alongside openshift-install or in `$PATH`.
26-
If you don't have [terraform](https://www.terraform.io/), run the following to create `bin/terraform`:
27-
28-
```sh
29-
hack/get-terraform.sh
30-
```
31-
3225
The installer will show a series of prompts for user-specific information and use reasonable defaults for everything else. In non-interactive contexts, prompts can be bypassed by providing appropriately-named environment variables. Refer to the [user documentation](docs/user) for more information.
3326

3427
### Connect to the cluster

docs/user/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The following targets can be created by the installer:
3838
- `install-config` - The install config contains the main parameters for the installation process. This configuration provides the user with more options than the interactive prompts and comes pre-populated with default values.
3939
- `manifests` - This target outputs all of the Kubernetes manifests that will be installed on the cluster.
4040
- `ignition-configs` - These are the three Ignition Configs for the bootstrap, master, and worker machines.
41-
- `cluster` - This target provisions the cluster by invoking a locally-installed Terraform.
41+
- `cluster` - This target provisions the cluster and its associated infrastructure.
4242

4343
The following targets can be destroyed by the installer:
4444

hack/get-terraform.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

images/installer/Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
FROM openshift/origin-release:golang-1.10 AS build
55
WORKDIR /go/src/github.com/openshift/installer
66
COPY . .
7-
RUN hack/build.sh && hack/get-terraform.sh
7+
RUN hack/build.sh
88

99

1010
FROM centos:7

images/nested-libvirt/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FROM openshift/origin-release:golang-1.10 AS build
44
WORKDIR /go/src/github.com/openshift/installer
55
COPY . .
6-
RUN hack/build.sh && hack/get-terraform.sh
6+
RUN hack/build.sh
77

88
FROM centos:7
99
COPY --from=build /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install

0 commit comments

Comments
 (0)