From 702ee7bb43a41ea1e1cb46935285fb869bdb47e8 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 11 Sep 2018 09:39:17 -0700 Subject: [PATCH] *: Remove stale Container Linux references Catching up with 66ef3beb (*: remove support for container linux, 2018-09-06, #221). --- Documentation/contrib/modify-installer.md | 1 - Documentation/dev/libvirt-howto.md | 17 +--------- modules/aws/ami/README.md | 40 ----------------------- modules/aws/ami/main.tf | 33 ------------------- modules/aws/ami/variables.tf | 21 ------------ steps/variables-libvirt.tf | 2 +- 6 files changed, 2 insertions(+), 112 deletions(-) delete mode 100644 modules/aws/ami/README.md delete mode 100644 modules/aws/ami/main.tf delete mode 100644 modules/aws/ami/variables.tf diff --git a/Documentation/contrib/modify-installer.md b/Documentation/contrib/modify-installer.md index 561e624d755..ece7eeb049f 100644 --- a/Documentation/contrib/modify-installer.md +++ b/Documentation/contrib/modify-installer.md @@ -7,7 +7,6 @@ Please also note that using "alpha features" through existing Beta or Stable API ## Machine level modifications Always safe to modify: -* Container Linux channels. All Container Linux channels may be modified (stable, beta, and alpha). Never safe to modify: * Kubelet configuration, including CNI. Modification of the kubelet configuration may result in an inability to start pods, or a failure in communication between cluster components. diff --git a/Documentation/dev/libvirt-howto.md b/Documentation/dev/libvirt-howto.md index 09488ac671b..8a5f98494ab 100644 --- a/Documentation/dev/libvirt-howto.md +++ b/Documentation/dev/libvirt-howto.md @@ -5,7 +5,7 @@ for operator development. ## HOW TO: ### 1. One-time setup -It's expected that you will create and destroy clusters often in the course of development. These steps only need to be run once (or once per Container Linux or RHCOS update). +It's expected that you will create and destroy clusters often in the course of development. These steps only need to be run once (or once per RHCOS update). #### 1.1 Pick a name and ip range In this example, we'll set the baseDomain to `tt.testing`, the name to `test1` and the ipRange to `192.168.124.0/24` @@ -18,8 +18,6 @@ cd installer #### 1.3 Download and prepare the operating system image -#### 1.3a RHCOS - Download the latest RHCOS image (you will need access to the Red Hat internal build systems): ```sh @@ -27,19 +25,6 @@ wget http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/latest gunzip rhcos-qemu.qcow2.gz ``` -#### 1.3b Container Linux - -Download the latest stable Container Linux image: -```sh -wget https://stable.release.core-os.net/amd64-usr/current/coreos_production_qemu_image.img.bz2 -bunzip2 coreos_production_qemu_image.img.bz2 -``` - -Because of the greater disk requirements of OpenShift, you'll need to expand the root drive with the following: -```sh -qemu-img resize coreos_production_qemu_image.img +8G -``` - #### 1.4 Get a pull secret Go to https://account.coreos.com/ and obtain a Tectonic *pull secret*. diff --git a/modules/aws/ami/README.md b/modules/aws/ami/README.md deleted file mode 100644 index 1c6072317ba..00000000000 --- a/modules/aws/ami/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# Container Linux AMI Module - -This [Terraform][] [module][] supports `latest` versions for [Container Linux][container-linux] release channels and returns an appropriate [AMI][]. -It uses [implicit provider inheritance][implicit-provider-inheritance] to access the [AWS provider][AWS-provider]. - -## Example - -Set up a `main.tf` with: - -```hcl -provider "aws" { - region = "us-east-1" -} - -module "ami" { - source = "github.com/openshift/installer//modules/aws/ami" -} - -output "ami" { - value = "${module.ami.id}" -} -``` - -You can set `release_channel` and `release_version` if you need a specific Container Linux install. - -Then run: - -```console -$ terraform init -$ terraform apply -$ terraform output ami -ami-00cc4337762ba4a52 -``` - -[AMI]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html -[AWS-provider]: https://www.terraform.io/docs/providers/aws/ -[container-linux]: https://coreos.com/os/docs/latest/ -[implicit-provider-inheritance]: https://www.terraform.io/docs/modules/usage.html#implicit-provider-inheritance -[module]: https://www.terraform.io/docs/modules/ -[Terraform]: https://www.terraform.io/ diff --git a/modules/aws/ami/main.tf b/modules/aws/ami/main.tf deleted file mode 100644 index 9c9911d3e97..00000000000 --- a/modules/aws/ami/main.tf +++ /dev/null @@ -1,33 +0,0 @@ -locals { - ami_owner = "595879546273" - arn = "aws" -} - -module "container_linux" { - source = "../../container_linux" - - release_channel = "${var.release_channel}" - release_version = "${var.release_version}" -} - -data "aws_ami" "coreos_ami" { - filter { - name = "name" - values = ["CoreOS-${var.release_channel}-${module.container_linux.version}-*"] - } - - filter { - name = "architecture" - values = ["x86_64"] - } - - filter { - name = "virtualization-type" - values = ["hvm"] - } - - filter { - name = "owner-id" - values = ["${local.ami_owner}"] - } -} diff --git a/modules/aws/ami/variables.tf b/modules/aws/ami/variables.tf deleted file mode 100644 index 49172b45eb8..00000000000 --- a/modules/aws/ami/variables.tf +++ /dev/null @@ -1,21 +0,0 @@ -variable "release_channel" { - type = "string" - default = "stable" - - description = <