Skip to content

Commit 18ef28d

Browse files
committed
pkg/rhcos/ami: Bump to ami-0af8953af3ec06b7c
Details on this build: $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/aws-us-east-1-tested.json | jq -S { "HVM": "ami-0af8953af3ec06b7c", "S3Object": "s3://openshift-qe-images/rhcos/cloud/rhcos-4.0.5595-aws.vmdk", "SnapshotID": "snap-07b2295a6b24ebf60" } $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/4.0.5595-1/meta.json | jq -S { "git-commit": "3863c9670d95ed950e5f68ca5e93947dfd214ef1", "image-genver": "1", "image-version": "4.0.5595-1", "ostree-commit": "622abd584071ebd426ff33b3d5b17cf08e16eff7d7fd2a9d97ace8ad24e3cedc", "ostree-version": "4.0.5595" } $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/4.0.5595-1/pkglist.txt | grep 'docker\|runc' docker-2:1.13.1-75.git8633870.el7_5.x86_64 docker-client-2:1.13.1-75.git8633870.el7_5.x86_64 docker-common-2:1.13.1-75.git8633870.el7_5.x86_64 docker-lvm-plugin-2:1.13.1-75.git8633870.el7_5.x86_64 docker-novolume-plugin-2:1.13.1-75.git8633870.el7_5.x86_64 docker-rhel-push-plugin-2:1.13.1-75.git8633870.el7_5.x86_64 runc-1.0.0-52.dev.git70ca035.el7_5.x86_64 After a brief window without either Docker or a working CRI-O, we've got a new RHCOS with Docker back on. Let's use it. This bump should also pull in runc-1.0.0-52.dev.git70ca035.el7_5.x86_64 needed by the next commit. Generated with: $ sed -i s/ami-07307c397daf4d02e/ami-0af8953af3ec06b7c/g $(git grep -l ami-07307c397daf4d02e)
1 parent 2457075 commit 18ef28d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ data:
8989
availabilityZone: ""
9090
clusterID: ""
9191
clusterName: test
92-
image: ami-07307c397daf4d02e
92+
image: ami-0af8953af3ec06b7c
9393
region: us-east-1
9494
replicas: 3
9595
kind: machineAPIOperatorConfig

installer/pkg/workflow/fixtures/terraform.tfvars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"tectonic_admin_email": "[email protected]",
33
"tectonic_admin_password": "fake-password",
4-
"tectonic_aws_ec2_ami_override": "ami-07307c397daf4d02e",
4+
"tectonic_aws_ec2_ami_override": "ami-0af8953af3ec06b7c",
55
"tectonic_aws_endpoints": "all",
66
"tectonic_aws_master_ec2_type": "m4.large",
77
"tectonic_aws_master_root_volume_iops": 100,

modules/aws/bootstrap/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ resource "aws_subnet" "example" {
2929
module "bootstrap" {
3030
source = "github.com/openshift/installer//modules/aws/bootstrap"
3131
32-
ami = "ami-07307c397daf4d02e"
32+
ami = "ami-0af8953af3ec06b7c"
3333
bucket = "${aws_s3_bucket.example.id}"
3434
cluster_name = "my-cluster"
3535
ignition = "{\"ignition\": {\"version\": \"2.2.0\"}}",

pkg/rhcos/ami.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ func AMI(channel, region string) (ami string, err error) {
1414
return "", fmt.Errorf("region %q is not yet supported", region)
1515
}
1616

17-
return "ami-07307c397daf4d02e", nil
17+
return "ami-0af8953af3ec06b7c", nil
1818
}

0 commit comments

Comments
 (0)