Skip to content

Commit

Permalink
rebase-4.14.0-0.nightly-2023-06-15-064008_amd64-2023-06-15_arm64-2023…
Browse files Browse the repository at this point in the history
…-06-16 (#1935)

* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot authored Jun 16, 2023
1 parent 1916b2f commit 1f38098
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 20 deletions.
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.14.0-0.nightly-arm64-2023-06-13-223356
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-16-015443
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-2023-06-12-141936
OCP_VERSION := 4.14.0-0.nightly-2023-06-15-064008
8 changes: 4 additions & 4 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2023-06-13-223356"
"base": "4.14.0-0.nightly-arm64-2023-06-16-015443"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ae9fdf90f5afa38d9d7117353f0ad2cb944b262226cca442298dcb4116ae87e",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca7c0e7727ae4687879baaa5e9491c09465db3fc4679098631a66b375a36f9b4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5551810825d86b7f91e151f8862a16505b80c532dfe40ff6a572839438070e49",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33445094091e09a0ab5dfabe8824e59988656c5adfbdd08e644f55cc4425c7c1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c41f565cdb623a16cf243c485558a446c770974198bc2d3c8154e8108d787c49",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:136d0516ec9ef88d7d7742e96534b16631357b7550be0669be7df38ba9e986b8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01fa2f6f2d99ef6169952e189b6312b999da1ba217e18911c572374a4a9176f9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09acb11bafe23dc67d7a1f08e250a8fc9ab711263d69334992359b5ccc6708a6",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a64142f2ced1c51154ee51a6703f21fd0b3e70714d4cbe4c51b7bc7a8ad70835",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97121a166a4d7cb65a45d793c026a9e22f6db6ee1df4c5c0e6f9761a2e10d299",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.14.0-0.nightly-2023-06-12-141936"
"base": "4.14.0-0.nightly-2023-06-15-064008"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32fda4dd1847f32f71704f374940222826193499729e2bc03d516c00e07a824f",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d02ff47097f0a1e1a5b2612c3ea763479d367e30a5a5d31cee2f75ffec691d3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db807ead1b7a4b2f591accd082d0329817803f59c657a5b491c9ce64e15cf27d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8c228c6089e0e49b0c8ef680cf148d8f655fa9f0595b087ce88873cd6785d08",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d4a58a54e9b3f082269808d73a5546fb9197ee3692d350330dd49d5dd98de81",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e51e645908ebc75358739c8e8ef85b76135cd7b8fd5a5979782b9a80e829f8db",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fb22bf94fe8be7a6044107dc7708a6962b913d6189af6e1f10a236018661147",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ec15a3e6118978cbf33f9544775b2f422c1858e01d41d35e0b9ed8e790df237",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af13f22ebe9c0560a3c68d91971ad9f5be96fcda968a42d86d9562420ee8ed3c",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/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:01fa2f6f2d99ef6169952e189b6312b999da1ba217e18911c572374a4a9176f9"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a64142f2ced1c51154ee51a6703f21fd0b3e70714d4cbe4c51b7bc7a8ad70835"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading

0 comments on commit 1f38098

Please sign in to comment.