Skip to content

Migrate to Ignition config spec v3.1 and bump RHCOS #3871

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 3 commits into from
Jul 30, 2020
Merged

Migrate to Ignition config spec v3.1 and bump RHCOS #3871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9e9844
vendor: Bump terraform-provider-ironic to v0.2.2
LorbusChris Jul 9, 2020
b9028ee
*: Migrate to ignition config spec v3.1
LorbusChris Jul 21, 2020
d4348d9
data/data: update rhcos to 46.82.202007212240-0 for getting public gc…
abhinavdahiya Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion data/data/aws/bootstrap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module "bootstrap" {

ami = "ami-0af8953af3ec06b7c"
cluster_id = "my-cluster"
ignition = "{\"ignition\": {\"version\": \"2.2.0\"}}",
ignition = "{\"ignition\": {\"version\": \"3.1.0\"}}",
subnet_id = "${aws_subnet.example.id}"
vpc_id = "${aws_vpc.example.id}"
}
Expand Down
2 changes: 1 addition & 1 deletion data/data/baremetal/bootstrap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module "bootstrap" {
addresses = ["192.168.0.1"]
base_volume_id = "${libvirt_volume.example.id}"
cluster_id = "my-cluster"
ignition = "{\"ignition\": {\"version\": \"2.2.0\"}}",
ignition = "{\"ignition\": {\"version\": \"3.1.0\"}}",
network_id = "${libvirt_network.example.id}"
}
```
Expand Down
2 changes: 1 addition & 1 deletion data/data/bootstrap/files/etc/ignition-machine-config-encapsulated.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"spec": {
"config": {
"ignition": {
"version": "2.2.0"
"version": "3.1.0"
}
},
"kernelArguments": [],
Expand Down
2 changes: 1 addition & 1 deletion data/data/libvirt/bootstrap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module "bootstrap" {
addresses = ["192.168.0.1"]
base_volume_id = "${libvirt_volume.example.id}"
cluster_id = "my-cluster"
ignition = "{\"ignition\": {\"version\": \"2.2.0\"}}",
ignition = "{\"ignition\": {\"version\": \"3.1.0\"}}",
network_id = "${libvirt_network.example.id}"
}
```
Expand Down
9 changes: 4 additions & 5 deletions data/data/openstack/masters/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ data "openstack_compute_flavor_v2" "masters_flavor" {
}

data "ignition_file" "hostname" {
count = var.instance_count
filesystem = "root"
mode = "420" // 0644
path = "/etc/hostname"
count = var.instance_count
mode = "420" // 0644
path = "/etc/hostname"

content {
content = <<EOF
Expand All @@ -18,7 +17,7 @@ EOF
data "ignition_config" "master_ignition_config" {
count = var.instance_count

append {
merge {
source = "data:text/plain;charset=utf-8;base64,${base64encode(var.user_data_ign)}"
}

Expand Down
148 changes: 74 additions & 74 deletions data/data/rhcos-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,155 +1,155 @@
{
"amis": {
"ap-northeast-1": {
"hvm": "ami-066fc016ad2cc6efe"
"hvm": "ami-097223d75618696f6"
},
"ap-northeast-2": {
"hvm": "ami-01f46fb904e0684b2"
"hvm": "ami-068836f5f6bd6a4eb"
},
"ap-south-1": {
"hvm": "ami-099d895038514309b"
"hvm": "ami-007cbf7568ed0cf8e"
},
"ap-southeast-1": {
"hvm": "ami-0bc45856934f33edd"
"hvm": "ami-0a38940d6b69ae8db"
},
"ap-southeast-2": {
"hvm": "ami-067cd390da6064a77"
"hvm": "ami-0744f27a305bcece6"
},
"ca-central-1": {
"hvm": "ami-00623d6780a2c34b4"
"hvm": "ami-0bcf9bd549608264c"
},
"eu-central-1": {
"hvm": "ami-01b8750c4c9851cb5"
"hvm": "ami-0cf688e3399ef337d"
},
"eu-north-1": {
"hvm": "ami-04cb9c3518ba8b329"
"hvm": "ami-023c0a7bbf6d38764"
},
"eu-west-1": {
"hvm": "ami-01bdfcdea0b4eb892"
"hvm": "ami-0ed04edc63e936b41"
},
"eu-west-2": {
"hvm": "ami-08031166f3e3d4985"
"hvm": "ami-083036adfb53b91f9"
},
"eu-west-3": {
"hvm": "ami-0d4aa9314eef25125"
"hvm": "ami-08639446463022560"
},
"me-south-1": {
"hvm": "ami-041253f327bf7d9e4"
"hvm": "ami-00840e032f6d8d53b"
},
"sa-east-1": {
"hvm": "ami-0d3ad80b7bc896e8a"
"hvm": "ami-0429af3b8334a55a3"
},
"us-east-1": {
"hvm": "ami-029ea2df51a883971"
"hvm": "ami-05f1151e12292bde8"
},
"us-east-2": {
"hvm": "ami-0763a9bebd98ae80f"
"hvm": "ami-01b75fd2de5633a1d"
},
"us-west-1": {
"hvm": "ami-0e267109df1542630"
"hvm": "ami-0e7a3cf45d3f7b6fb"
},
"us-west-2": {
"hvm": "ami-061eaa5d9cbae808e"
"hvm": "ami-0dcd510e84504ddf6"
}
},
"azure": {
"image": "rhcos-46.82.202007051540-0-azure.x86_64.vhd",
"url": "https://rhcos.blob.core.windows.net/imagebucket/rhcos-46.82.202007051540-0-azure.x86_64.vhd"
"image": "rhcos-46.82.202007212240-0-azure.x86_64.vhd",
"url": "https://rhcos.blob.core.windows.net/imagebucket/rhcos-46.82.202007212240-0-azure.x86_64.vhd"
},
"baseURI": "https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.6/46.82.202007051540-0/x86_64/",
"buildid": "46.82.202007051540-0",
"baseURI": "https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.6/46.82.202007212240-0/x86_64/",
"buildid": "46.82.202007212240-0",
"gcp": {
"image": "rhcos-46-82-202007051540-0-gcp-x86-64",
"image": "rhcos-46-82-202007212240-0-gcp-x86-64",
"project": "rhcos-cloud",
"url": "https://storage.googleapis.com/rhcos/rhcos/rhcos-46-82-202007051540-0-gcp-x86-64.tar.gz"
"url": "https://storage.googleapis.com/rhcos/rhcos/rhcos-46-82-202007212240-0-gcp-x86-64.tar.gz"
},
"images": {
"aws": {
"path": "rhcos-46.82.202007051540-0-aws.x86_64.vmdk.gz",
"sha256": "0534f8562f9f205cade258060e9f81f441fb31c01d4449da02dee0e6ccbb3d20",
"size": 923951833,
"uncompressed-sha256": "94df67057275a8cec3f6463aff58a272eea6bb3955a0d7f0a2aa274252a52c6d",
"uncompressed-size": 943734784
"path": "rhcos-46.82.202007212240-0-aws.x86_64.vmdk.gz",
"sha256": "ebcf51f5599f19ad665dd57a1d4b0df1f1b88b1428e5ccdd97f64fde2b7852ac",
"size": 925174479,
"uncompressed-sha256": "79d7da1860de3a140de5aad3b31792165df82c642ccb9d97571cf69792103e2e",
"uncompressed-size": 944944128
},
"azure": {
"path": "rhcos-46.82.202007051540-0-azure.x86_64.vhd.gz",
"sha256": "4783f2dd17f0f367925a0a34d700e8f7a056227ea0e3864444d2cb7e492660c6",
"size": 924738226,
"uncompressed-sha256": "21e7ebffbb2ee80c05634b2645c9118ffff0b0bcf573b128459d81632a0bd9ad",
"path": "rhcos-46.82.202007212240-0-azure.x86_64.vhd.gz",
"sha256": "67d50e659b7736c4f38fa62b863aaaea9619a5da07c1d4a9b62d59ac5679633d",
"size": 925888045,
"uncompressed-sha256": "89cba6d62a38ff8cf5aac5f411441486d17ae5b563ce9929ca2c4aed65ed3950",
"uncompressed-size": 17179869696
},
"gcp": {
"path": "rhcos-46.82.202007051540-0-gcp.x86_64.tar.gz",
"sha256": "e537fc66dcaa516f69164f28d7d73c804db78cf182c4649fca31254d211c8de4",
"size": 910056450
"path": "rhcos-46.82.202007212240-0-gcp.x86_64.tar.gz",
"sha256": "ce795cbb47f0e19f68d3d402f3a5a4ca79eccb149d92023fe545355c245a0bd8",
"size": 911200334
},
"initramfs": {
"path": "rhcos-46.82.202007051540-0-installer-initramfs.x86_64.img",
"sha256": "333b95bcd570f1193166c5576b9917e35f6e5f3074595afbed13ed4ab29c49e4"
"path": "rhcos-46.82.202007212240-0-installer-initramfs.x86_64.img",
"sha256": "32390ffcb19de46e01543a70692324ac4987c56ea6be9bcad41b6ea757db17c2"
},
"iso": {
"path": "rhcos-46.82.202007051540-0-installer.x86_64.iso",
"sha256": "a2258eb7015bb201043a992f7dc3fbd98741d0d8d709fc50d20662178a4d076b"
"path": "rhcos-46.82.202007212240-0-installer.x86_64.iso",
"sha256": "df5fbf11565c910e5cfd5c100e2a2da61e17114c73f3ee77ef63fc9f42fa2944"
},
"kernel": {
"path": "rhcos-46.82.202007051540-0-installer-kernel-x86_64",
"path": "rhcos-46.82.202007212240-0-installer-kernel-x86_64",
"sha256": "57b1e7d0205dac1c6d0478ca045d35160d89d96c0cb746d5973fe68a2b36f498"
},
"live-initramfs": {
"path": "rhcos-46.82.202007051540-0-live-initramfs.x86_64.img",
"sha256": "2a441ca01d6f0ee678c1db1af3147634adbba3f0fc0df0cf6616daea75d77782"
"path": "rhcos-46.82.202007212240-0-live-initramfs.x86_64.img",
"sha256": "e8f155dd84e80b33b4aab0b926b3519b67f71522c57d915c73252ab5cf1ffc15"
},
"live-iso": {
"path": "rhcos-46.82.202007051540-0-live.x86_64.iso",
"sha256": "c8eed12d32dacd5c7fec1633ae2579b39fa85d04e705220cffe77ee124488e2e"
"path": "rhcos-46.82.202007212240-0-live.x86_64.iso",
"sha256": "4dea02dce2364cade426695c166e17085499e50896de188e89a5cc832138d233"
},
"live-kernel": {
"path": "rhcos-46.82.202007051540-0-live-kernel-x86_64",
"path": "rhcos-46.82.202007212240-0-live-kernel-x86_64",
"sha256": "57b1e7d0205dac1c6d0478ca045d35160d89d96c0cb746d5973fe68a2b36f498"
},
"metal": {
"path": "rhcos-46.82.202007051540-0-metal.x86_64.raw.gz",
"sha256": "7b4270558df9ddbd50b56fa4a37fc4cf1e59a445dc5788e59af193607f31d3b7",
"size": 911771641,
"uncompressed-sha256": "ae2c74e3397ffb2211de05c4d6dc17cddb7b8d1db3bbc902f76a7f474558e901",
"uncompressed-size": 3768582144
"path": "rhcos-46.82.202007212240-0-metal.x86_64.raw.gz",
"sha256": "395257b2a5be428b4d6e250c257ae1f5d1052d1a5bcfffa10d8093fa46072927",
"size": 912970486,
"uncompressed-sha256": "45594e9649f575bffa192f4fe8617cdc1741a52f20d504acd8265d043d26f87e",
"uncompressed-size": 3755999232
},
"metal4k": {
"path": "rhcos-46.82.202007051540-0-metal4k.x86_64.raw.gz",
"sha256": "d67cafe630bbb6bfa7b73e6a16c783a8e4a8cc44e20cfc0f4bf62029fd57e350",
"size": 909229263,
"uncompressed-sha256": "4be81e549ace2ec0c5ba9a050226c5e446c57af4db61c215bf641de2a60fba4a",
"uncompressed-size": 3768582144
"path": "rhcos-46.82.202007212240-0-metal4k.x86_64.raw.gz",
"sha256": "81cf7be2e05c14a1b4b3860c415f5e29633f6f50540bd22e2c3f382976198e52",
"size": 910627849,
"uncompressed-sha256": "0b74103a47b06ded7bd1f41411ba7bd60a0201b4992edb91ceaf32c57e8152c9",
"uncompressed-size": 3755999232
},
"openstack": {
"path": "rhcos-46.82.202007051540-0-openstack.x86_64.qcow2.gz",
"sha256": "a16c1cec2f5d17d7419be37801f7ade14726ed240c854499137fb8b536503d94",
"size": 910390161,
"uncompressed-sha256": "5283315d84727ea287837e2e5558a57fad3a041afe2c05d4f6d319ff6a6a0e2d",
"uncompressed-size": 2411331584
"path": "rhcos-46.82.202007212240-0-openstack.x86_64.qcow2.gz",
"sha256": "30dd39690859244d0a02955450bcf3cf9d4ed074ac2e03f7dbf695baf8d224bb",
"size": 911546031,
"uncompressed-sha256": "3a0acaac326f9f4343347bdfc5f651bb9f542d9193429812e8e20a774c34be53",
"uncompressed-size": 2402156544
},
"ostree": {
"path": "rhcos-46.82.202007051540-0-ostree.x86_64.tar",
"sha256": "e6b570a3559b76ca7350ed5865ebb799bb769a11883e38129326c995603e3aca",
"size": 838369280
"path": "rhcos-46.82.202007212240-0-ostree.x86_64.tar",
"sha256": "f45e551dadedf4091d265bc08ec06320a615b98d59c5b65e0683837ae4e0a5e1",
"size": 840120320
},
"qemu": {
"path": "rhcos-46.82.202007051540-0-qemu.x86_64.qcow2.gz",
"sha256": "d74174df0c5813d0eaf5d31742504b775222385810dc8bf90b7a6b4af6c4b5fb",
"size": 911548547,
"uncompressed-sha256": "238119fc6150a8b24aaae656acfbeec7d87e7e10257760f6f2b3f02682b13d72",
"uncompressed-size": 2454323200
"path": "rhcos-46.82.202007212240-0-qemu.x86_64.qcow2.gz",
"sha256": "973c0d7592c73ac28fc8b811d938d603024a389bbbb6081ebe54c6861d776ee4",
"size": 912652369,
"uncompressed-sha256": "847cefe9e0217097460ba4891e6cb522520243d9cdda3e5f3e5fe2a03730a94b",
"uncompressed-size": 2444165120
},
"vmware": {
"path": "rhcos-46.82.202007051540-0-vmware.x86_64.ova",
"sha256": "9aac806ee9340e528848f1a1e942eaac1a0ca9fb82a819153209657df5ce60c5",
"size": 943749120
"path": "rhcos-46.82.202007212240-0-vmware.x86_64.ova",
"sha256": "699e5450a2e4f9f29b9a464557ddaaaaf993fc7558a029efb70758baf9d1a815",
"size": 944957440
}
},
"oscontainer": {
"digest": "sha256:cd9a8a31bb18ab16a25342c4d22721affd131fa2655f0c24e1282844bbc17cee",
"digest": "sha256:e46196e13bfdb57b708f7b9edd2955ed168dad779de3e385dbecf388b2fea8dd",
"image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev"
},
"ostree-commit": "7510d2facb4d483f21724d862481cbdaa0e9e1ea169912ef329d44ce14c385a9",
"ostree-version": "46.82.202007051540-0"
"ostree-commit": "1789554d548ea817b47b3e8c9db9d7395ca278879b4e357f8c80928cd4ef6952",
"ostree-version": "46.82.202007212240-0"
}
Loading