Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2024-12-18-203600_amd64-2024-12-18_arm64-2024-12-18 #4334

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-bot merged 9 commits into from
Dec 19, 2024
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2024-12-18-203600_amd64-2024-12-18_arm64-2024-12-18 #4334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
117b7a6
update last_rebase.sh
Dec 19, 2024
99975e6
update changelog
Dec 19, 2024
b7808b5
update microshift/go.mod
Dec 19, 2024
362f54b
update microshift/vendor
Dec 19, 2024
ffcdd6b
update etcd/go.mod
Dec 19, 2024
13d3a51
update etcd/vendor
Dec 19, 2024
01e2065
update component images
Dec 19, 2024
10ada5b
update manifests
Dec 19, 2024
24d6756
update buildfiles
Dec 19, 2024
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
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=30
KUBE_GIT_VERSION=v1.30.6
KUBE_GIT_COMMIT=df0195cb1143b34da26b6aa490ab812036e77898
KUBE_GIT_VERSION=v1.30.7
KUBE_GIT_COMMIT=f868289cea8577c895fa957b466f209b9af6a1a2
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-12-15-102601
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-12-18-233500
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-2024-12-15-083313
OCP_VERSION := 4.17.0-0.nightly-2024-12-18-203600
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
View file
Open in desktop
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:5181e105167cf80e454e261a1159af1173f8e877901cac498c2a06617eb88810
digest: sha256:9928ae684f0c0386863e36cef288c11798259e35ff1512458441bd2c847d0b59
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:aef47bc2ae5ae00bbbae8c6700258ca4bbe2fe0d2c823d4087808a6df419484c
digest: sha256:350632f487385b2dfb497940eaf557f14bd3c3452db7fe9d8391554f2441e072
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
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:14777fdf27f2d34051f5f6c3b3a7fbb5bbb7e72695f6c1f830670677da0b4d5a
digest: sha256:01c5940636c31985b7ce70971230ba78042df3d456c740b2f89cd6e8736f7bad
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f646827fbd45ce9bc1fe11433a67cd5ae25d6c14d67051233288fa7fbd929c21
digest: sha256:8f8ed8ec72082e9206c06c37806c7aa3b5d9344860068e09f5b50c9513757b13
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-12-15-102601"
"base": "4.17.0-0.nightly-arm64-2024-12-18-233500"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5181e105167cf80e454e261a1159af1173f8e877901cac498c2a06617eb88810",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aef47bc2ae5ae00bbbae8c6700258ca4bbe2fe0d2c823d4087808a6df419484c"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9928ae684f0c0386863e36cef288c11798259e35ff1512458441bd2c847d0b59",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:350632f487385b2dfb497940eaf557f14bd3c3452db7fe9d8391554f2441e072"
}
}
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-12-15-083313"
"base": "4.17.0-0.nightly-2024-12-18-203600"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14777fdf27f2d34051f5f6c3b3a7fbb5bbb7e72695f6c1f830670677da0b4d5a",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f646827fbd45ce9bc1fe11433a67cd5ae25d6c14d67051233288fa7fbd929c21"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01c5940636c31985b7ce70971230ba78042df3d456c740b2f89cd6e8736f7bad",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f8ed8ec72082e9206c06c37806c7aa3b5d9344860068e09f5b50c9513757b13"
}
}
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
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:afbe6fe6782e10272911b6a719b9ea35593623a7756df5111e6e797773f72ec6
digest: sha256:843e4d3c1c5220ce05e3af0f44c07ca47c931a585f4422b23c832f9c888276af
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bf944171926cef99d783ecc7b165f9828d7fc9aedb00f5603a172e73f7410ea8
digest: sha256:76cc0d0a735854d1f045d5bc6c910dc9079e187be943df5c7a89ea437264f6bc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8d431cca56299893e8bf8d1f38fb6ef85afa9cd583b12b580a2ce635299ce66a
digest: sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87

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:bf944171926cef99d783ecc7b165f9828d7fc9aedb00f5603a172e73f7410ea8
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76cc0d0a735854d1f045d5bc6c910dc9079e187be943df5c7a89ea437264f6bc
- 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:afbe6fe6782e10272911b6a719b9ea35593623a7756df5111e6e797773f72ec6
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:843e4d3c1c5220ce05e3af0f44c07ca47c931a585f4422b23c832f9c888276af
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
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:17ff052a9579bae623a6d60fa2fcf24c02bae8f550c9effe23a3500f3c5e65fb
digest: sha256:3d9a022a664f62e1802b0659c0bbf641a274b85a554876f145198b50ca52367f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3248ccf6fb6fb425ab1f300928fa2c05081a1c814867d0576d6a8d778582ade1
digest: sha256:8dd1e7b0ad44694f1dfcf740ca2c360f35a80b9ff084822bcab888bc198a05be
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:901e992d0e5f69019f9a1c973d8a052b918a063a89f3843e53cea9421f02ff17
digest: sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990

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:3248ccf6fb6fb425ab1f300928fa2c05081a1c814867d0576d6a8d778582ade1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1e7b0ad44694f1dfcf740ca2c360f35a80b9ff084822bcab888bc198a05be
- 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:17ff052a9579bae623a6d60fa2fcf24c02bae8f550c9effe23a3500f3c5e65fb
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9a022a664f62e1802b0659c0bbf641a274b85a554876f145198b50ca52367f
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-12-15-102601"
"base": "4.17.0-0.nightly-arm64-2024-12-18-233500"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afbe6fe6782e10272911b6a719b9ea35593623a7756df5111e6e797773f72ec6",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf944171926cef99d783ecc7b165f9828d7fc9aedb00f5603a172e73f7410ea8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d431cca56299893e8bf8d1f38fb6ef85afa9cd583b12b580a2ce635299ce66a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:843e4d3c1c5220ce05e3af0f44c07ca47c931a585f4422b23c832f9c888276af",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76cc0d0a735854d1f045d5bc6c910dc9079e187be943df5c7a89ea437264f6bc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87"
}
}
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-12-15-083313"
"base": "4.17.0-0.nightly-2024-12-18-203600"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17ff052a9579bae623a6d60fa2fcf24c02bae8f550c9effe23a3500f3c5e65fb",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3248ccf6fb6fb425ab1f300928fa2c05081a1c814867d0576d6a8d778582ade1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:901e992d0e5f69019f9a1c973d8a052b918a063a89f3843e53cea9421f02ff17"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9a022a664f62e1802b0659c0bbf641a274b85a554876f145198b50ca52367f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1e7b0ad44694f1dfcf740ca2c360f35a80b9ff084822bcab888bc198a05be",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-12-15-102601"
"base": "4.17.0-0.nightly-arm64-2024-12-18-233500"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c8574b6adf8204986ad807cdf242acb2a04566c6fe87a477b5479d9855cadfd",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e3ee21b24a05c31845ef8b7921609279252b15b1b28ac92d4028a0ff02dbb4d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3eae1ff6d43e4252e03e3b931d4e9fc0f31ecb3e9e441ee517c28fcdf938b9f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d431cca56299893e8bf8d1f38fb6ef85afa9cd583b12b580a2ce635299ce66a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8de17e70dccf7b9e91927f905d74e7437dc837268b80080aa4d2d93772c5f2fd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43b54d4c0e4c54b6baa274dd5da8b79472e0ca202b90135a6e327327c463eb21",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae2fb9427a64b877ef894e151f06c152b2a17a88b4880693fcca970abc843872",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76fbcd70dd558af4c2e3f91ce5cf756780cab9c480c9802f92195b0d47e90c2e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efdb736d758a2264e727855c49dd63b6387ed5a667058ba34673d025060582e4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d859ad0c8db2c937ad5ab27c50eeca05b45efc32e21bea1a480baa5827e6af2e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ace6a3dd12958acd2735b1e72082f31ac5d8e3c7ea3fb27f53bcdc5c33c88bd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33b3a5bc8407432c094d00a87d963a0e6c2f3c13486c2ccc6f00a541e74be54d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d6905d8453ae7058beac150f48e10d6ce5e0d663ecbf3339b7d10e858077a3b",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fd13a39bd71ceeafb544804c3af1633ebc34f9ed74e8f18052350f6eac19782",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:740881373ce7f749af6648785bb1679d365969b57c2a1da5e7cbae56c7cfd9cd"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96930d5109c682cf1046d7d771413bcfe0a2c73ec2894ff2e85f0f76a9b85f61",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b537bb1dc091f7ef15bf811ab4dbacdf7230547f0b7f55123462ef71a61cf371"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-12-15-083313"
"base": "4.17.0-0.nightly-2024-12-18-203600"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00e7e1338f858be4af9e978be098dec02a743fd4c31f1c2afd056577dfd524a4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:067b1a862dbf09ef08a9967885b787570361f30ff9d53152171efee282cfca5c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b6b273cbf83735e9d89175358fc74e1900b8a998df32711c3f14c7717b430d0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:901e992d0e5f69019f9a1c973d8a052b918a063a89f3843e53cea9421f02ff17",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb5b2533d2993fda17be6c67cc70b384b1fd177ce15ee216320f124a5e6d338c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f9c12df3f9cdfbdb81d02a9ef205f3749524c2ec0f3418ed7123f545671836b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3584fb55375c037e8c6dbc5c1dd7246680ed737ce03a15e38edb61258e3a7853",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:909827b4e48643872c28edda8a82df0383f733d10a2c82517c1ebfb73d93ccf4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2164d9059b8df17974fbd6513d442adb91987f058d6df2c0025ae160491c986e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac1508e67210a4ef8dc7e5f737d3b14173bda80e6cc217d8e9c07480ef7d1ce3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:903dfe5720c73a092766ade3ac734dad79c224d4616378305bcb7e7fa9287a68",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a8e32596eb5ca9e3774c93633fdeecfef67ce3feee91fa948b910a16898eb0",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:222e8fa29f55863ba0c157ee2ba2f460a82e073229688916c60825a75505cb48",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21010baacefd126c9fe2a90142548425c9472176bf0e30e499b7c33438802261",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d0561c241084eaba9ac712f511168a5511cc65ff991ac657d959ae167c161f2"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abe67c6a9d6dfa5c22826993e659cfff9dafe43270e629532b98f4f7cda7c679",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46c4dc12ec5fc95735447dec8f7890d03691fb9ea4ecf415d6d60f3c5274dd61"
}
}
Loading