Merge pull request #253 from wking/restore-tmpdir

modules/bootkube/resources/bootkube: Restore --tmpfs

Author: openshift-merge-robot

installer/pkg/config-generator/fixtures/kube-system.yaml

@@ -89,7 +89,7 @@ data:
       availabilityZone: ""
       clusterID: ""
       clusterName: test
-      image: ami-07307c397daf4d02e
+      image: ami-0af8953af3ec06b7c
       region: us-east-1
       replicas: 3
     kind: machineAPIOperatorConfig

installer/pkg/workflow/fixtures/terraform.tfvars

@@ -1,7 +1,7 @@
 {
   "tectonic_admin_email": "[email protected]",
   "tectonic_admin_password": "fake-password",
-  "tectonic_aws_ec2_ami_override": "ami-07307c397daf4d02e",
+  "tectonic_aws_ec2_ami_override": "ami-0af8953af3ec06b7c",
   "tectonic_aws_endpoints": "all",
   "tectonic_aws_master_ec2_type": "m4.large",
   "tectonic_aws_master_root_volume_iops": 100,

modules/aws/bootstrap/README.md

@@ -29,7 +29,7 @@ resource "aws_subnet" "example" {
 module "bootstrap" {
   source = "github.com/openshift/installer//modules/aws/bootstrap"
 
-  ami            = "ami-07307c397daf4d02e"
+  ami            = "ami-0af8953af3ec06b7c"
   bucket         = "${aws_s3_bucket.example.id}"
   cluster_name   = "my-cluster"
   ignition       = "{\"ignition\": {\"version\": \"2.2.0\"}}",

modules/bootkube/resources/bootkube.sh

@@ -64,6 +64,7 @@ trap "podman rm --force etcd-signer" ERR
 podman run \
 	--name etcd-signer \
 	--detach \
+	--tmpfs /tmp \
 	--volume /opt/tectonic/tls:/opt/tectonic/tls:ro,z \
 	--network host \
 	"${etcd_cert_signer_image}" \

pkg/rhcos/ami.go

@@ -14,5 +14,5 @@ func AMI(channel, region string) (ami string, err error) {
 		return "", fmt.Errorf("region %q is not yet supported", region)
 	}
 
-	return "ami-07307c397daf4d02e", nil
+	return "ami-0af8953af3ec06b7c", nil
 }