Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-10-022343
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-12-210753
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e6d51d2275cd9649c7f7c1a44ff50e6bfc02aa5eee391419320fb6460e5d662c
digest: sha256:5cb6b6572cbcdfb12f9bd636e66fc4903d788b61f3bdd7602c780ac4bcaa1118
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d1b2b1d543ffe875299a467ae219be096f6cd8fa9995bf2537d4b47ee0fd5114
digest: sha256:8e18e55188a989e4ef899146fc8c3d7b79c1a56c22874ee73f5e7eb154eab99d
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-08-10-022343"
"base": "4.17.0-0.nightly-arm64-2024-08-12-210753"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6d51d2275cd9649c7f7c1a44ff50e6bfc02aa5eee391419320fb6460e5d662c",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1b2b1d543ffe875299a467ae219be096f6cd8fa9995bf2537d4b47ee0fd5114"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cb6b6572cbcdfb12f9bd636e66fc4903d788b61f3bdd7602c780ac4bcaa1118",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e18e55188a989e4ef899146fc8c3d7b79c1a56c22874ee73f5e7eb154eab99d"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:56a79e3da867ae0117c52fc831764340f913171d8f1480961318be0d6f81c9fc
digest: sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f275836bca0b98a7803150fcaf6c9bdb609f9cacc0959a3ba63af9dcd85e790b
digest: sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec
digest: sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f275836bca0b98a7803150fcaf6c9bdb609f9cacc0959a3ba63af9dcd85e790b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56a79e3da867ae0117c52fc831764340f913171d8f1480961318be0d6f81c9fc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-08-10-022343"
"base": "4.17.0-0.nightly-arm64-2024-08-12-210753"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56a79e3da867ae0117c52fc831764340f913171d8f1480961318be0d6f81c9fc",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f275836bca0b98a7803150fcaf6c9bdb609f9cacc0959a3ba63af9dcd85e790b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-08-10-022343"
"base": "4.17.0-0.nightly-arm64-2024-08-12-210753"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d274a61aeb647111f90640820adcae819e554aa0b3fb6d0f04114d418be0a58",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7ac1f05360374948723b6d485d2d060576cce5f76cb02165ac534bd6e74c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc35935b69ef2bb23681365232199b386cb690cf0ce9489fa6cfb02ffeca9fe8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f5ceadbb0cc38973a0738da567ad92b4bfe002440830870d0391c6e58ec2203",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14b7112ec12e8b854354426c73aca7cd61d34a278964c29cb60f500a5bb396f2",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed1043d4b938921389829a042a32246ea1699cebf14ba6703d664ca3fc87723",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b33fcd7435f4bd91e3d72e2ac1d9ebf79f1e02e720d8dfe4629105e1b4373ff",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a23f1e43520ed20ce1afc5394fd1a1fc85e691aa3c7a9373896b2ffa6692879d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c31ec4fb16fbc1483f4e9909ea788edefc16ec12d35f963531e550731efa4d9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff448737adadea489e77f7ebe8a8a615dda5d1a84a5ca9087158c8482f83f4a7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99ccba70c29daca7823898b14c87373b55be8f7ac168025beaa9a2c3c57a540",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87a5167d4b1f6efaccebcf009057a80638269b25b86e19ed63fe060175749ae2",
"lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84012f43d7ae2f117e31883aa998a90817a83005212d1dd8f16b03ff410a87dd",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:046d06a33c03cdb90e1d29031ea5b9d72588ebc1bc6c6ac4b6b6d67462eeb781"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d18a54770d66a28808c2ccc4a7fa4de6a4900906fa53bcfce9132f37aea99f59",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69d8921a0b657cb3e5c675b1d077c99ea4bd4105402a6fcd4bf35ecae690b6b4"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a23f1e43520ed20ce1afc5394fd1a1fc85e691aa3c7a9373896b2ffa6692879d"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99ccba70c29daca7823898b14c87373b55be8f7ac168025beaa9a2c3c57a540"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
33 changes: 0 additions & 33 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,33 +0,0 @@
- api embedded-component 3cab566552bbc5c8ce7d11991cbc2bd1f21e1e1b to cbdcd0df43e80e4b31d1804e471828ed16fe06dc
- 24092e9 2024-08-08T04:24:09-07:00 Power VS: Move Power VS to CAPI by default
- 942fac4 2024-08-07T09:57:35-03:00 make update
- 0b113a5 2024-08-07T09:57:34-03:00 Add API for enabling EFS volume metrics
- 8f11151 2024-08-06T13:46:24-04:00 Promote Azure CAPI as the default Install method

- cluster-ingress-operator embedded-component 338435581ef8ffeaa793d5acdbebf3dbad3c6f48 to 7cf86c7c749fa62b9cffd9a62275e33a4083985e
- 2639954 2024-08-07T12:41:52-04:00 Bump controller-runtime to v0.18.4

- cluster-network-operator embedded-component 007124e56caf6a40af5d946884efb832889443c4 to d0ca3151c265f8c23fecdd82b9fc634e4a2c3756
- 61e73d2 2024-08-07T20:30:18+03:00 bindata, ovn-k: Add UserDefinedNetwork CRD and RBAC
- fd67779 2024-08-07T11:48:40-04:00 Add Azure MSI Env Var for ARO HCP

- machine-config-operator embedded-component 217f60789684c1e696c8ac9e1f974bec631ebf5e to 9c7a000be04738e98e4bae1709dad0b83af93113
- 3bb751ae 2024-08-07T11:44:50-06:00 Enabled boot image updates for AWS

- operator-framework-olm embedded-component 1fb6193e2a029c7134894acf788db94cbc7eebad to 38181182174edf751226e1f5b988afd6baa373e4
- 58aad503 2024-08-08T00:04:38+00:00 (fix) Resolver: list CatSrc using client, instead of referring to registry-server cache (#3349)
- 2911931a 2024-08-08T00:03:10+00:00 build(deps): bump golang.org/x/sync from 0.7.0 to 0.8.0 (#3358)
- 68efec67 2024-08-08T00:02:41+00:00 build(deps): bump golang.org/x/time from 0.5.0 to 0.6.0 (#3357)

- oc image-amd64 c2b6a626630692cead9c1fd0021e0b205ea033e6 to 535bf8e3ba0965d64070bd6109bb5de332f670b3
- 896d147f 2024-08-06T14:48:59-04:00 upgrade-status: add test coverage for a compact cluster and a single-node cluster

- oc image-arm64 c2b6a626630692cead9c1fd0021e0b205ea033e6 to 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf
- 20b82440 2024-08-07T22:53:29-04:00 Make MacAddress mandatory until installer validations are updated
- 2f7dc5fd 2024-08-07T22:45:52-04:00 Make MacAddress flag optional, add test for createConfigFileFromFlags
- 896d147f 2024-08-06T14:48:59-04:00 upgrade-status: add test coverage for a compact cluster and a single-node cluster
- 28c2836f 2024-07-31T05:54:29-04:00 added flags to support simper single node interface

- router image-arm64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 to a33f2b6ad04f8c39b95c1839340f0e38b5c0662a
- 1c32ae6 2024-08-07T10:01:37-04:00 Bump k8s.io/* packages to v0.30.3

2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-08-09-031511" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-08-10-022343"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-08-09-031511" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-08-12-210753"