Skip to content

NO-ISSUE: Rebase main 4.19.0 0.nightly 2025 01 21 163021 amd64 2025 01 21 arm64 2025 01 22 #4444

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
merged 9 commits into from
Jan 22, 2025
Merged

NO-ISSUE: Rebase main 4.19.0 0.nightly 2025 01 21 163021 amd64 2025 01 21 arm64 2025 01 22 #4444

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
dcd80f6
update last_rebase.sh
Jan 22, 2025
38247cb
update changelog
Jan 22, 2025
34a746c
update microshift/go.mod
Jan 22, 2025
c1bbfba
update microshift/vendor
Jan 22, 2025
519a41e
update etcd/go.mod
Jan 22, 2025
3546f54
update etcd/vendor
Jan 22, 2025
c520fb2
update manifests
Jan 22, 2025
bb50ef6
update buildfiles
Jan 22, 2025
e778258
Add missing params
pmtk Jan 22, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-20-000530
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-22-000530
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.19.0-0.nightly-2025-01-19-211100
OCP_VERSION := 4.19.0-0.nightly-2025-01-21-163021
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-01-20-000530"
"base": "4.19.0-0.nightly-arm64-2025-01-22-000530"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-01-19-211100"
"base": "4.19.0-0.nightly-2025-01-21-163021"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1",
Expand Down
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fb8a8b3aea5dbe8483b205f60bf3730c0c525fd2264d1045513c7a15a17508b4
digest: sha256:036e84019c195ec4fa3bb7709ef3ff267dec7e5061cdb701cfa6809ccc6b34c3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c6d5355654a9b51f38121fa2049fcb641d03c12d4b0163d0099290cb3c0efe31
digest: sha256:9a685cb45b8f38321105195418e551887db79198f8ee7581aae020ee8c7787be
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:290478ee07daaf4795f9925609bcd24e4ddcec635a28d5f9f70da8592c4458c6
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6d5355654a9b51f38121fa2049fcb641d03c12d4b0163d0099290cb3c0efe31
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a685cb45b8f38321105195418e551887db79198f8ee7581aae020ee8c7787be
- 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:fb8a8b3aea5dbe8483b205f60bf3730c0c525fd2264d1045513c7a15a17508b4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:036e84019c195ec4fa3bb7709ef3ff267dec7e5061cdb701cfa6809ccc6b34c3
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742
digest: sha256:55bd31be5bed96032d9a19fba4c5230c162717f9d68fc418be4d8796f2dfccb3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89
digest: sha256:df5929656b064e258ac3014379173fc37939b3cbc97f3bbe0c9804514ad87d98
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:21b1ec1ffeb289a947603674cda13a84c35545b04e4940dfef055147908220ab
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df5929656b064e258ac3014379173fc37939b3cbc97f3bbe0c9804514ad87d98
- 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:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55bd31be5bed96032d9a19fba4c5230c162717f9d68fc418be4d8796f2dfccb3
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 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.19.0-0.nightly-arm64-2025-01-20-000530"
"base": "4.19.0-0.nightly-arm64-2025-01-22-000530"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb8a8b3aea5dbe8483b205f60bf3730c0c525fd2264d1045513c7a15a17508b4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6d5355654a9b51f38121fa2049fcb641d03c12d4b0163d0099290cb3c0efe31",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:036e84019c195ec4fa3bb7709ef3ff267dec7e5061cdb701cfa6809ccc6b34c3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a685cb45b8f38321105195418e551887db79198f8ee7581aae020ee8c7787be",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:290478ee07daaf4795f9925609bcd24e4ddcec635a28d5f9f70da8592c4458c6"
}
}
6 changes: 3 additions & 3 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.19.0-0.nightly-2025-01-19-211100"
"base": "4.19.0-0.nightly-2025-01-21-163021"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55bd31be5bed96032d9a19fba4c5230c162717f9d68fc418be4d8796f2dfccb3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df5929656b064e258ac3014379173fc37939b3cbc97f3bbe0c9804514ad87d98",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21b1ec1ffeb289a947603674cda13a84c35545b04e4940dfef055147908220ab"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-01-20-000530"
"base": "4.19.0-0.nightly-arm64-2025-01-22-000530"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79daa4255ae7d52116b206e25d1fd285967da7fce179337ba58026437005339b",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-01-19-211100"
"base": "4.19.0-0.nightly-2025-01-21-163021"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c0615f0b2dde5d2673cc844ee5e4d05709446073314199a296ed07b2a77942a",
Expand Down
4 changes: 2 additions & 2 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ replace (
)

require (
github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429
github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f
github.com/spf13/cobra v1.8.1
go.etcd.io/etcd/server/v3 v3.5.13
Expand All @@ -31,7 +31,7 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect
github.com/openshift/library-go v0.0.0-20241218091209-6018a90c28d0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/vishvananda/netlink v1.1.0 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
Expand Down
8 changes: 4 additions & 4 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2 h1:wCRdyt+nHnJsfuLMJF9RW1JK8G4Gvo//gBy6bZI5USE=
github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429 h1:fz+u78YFRL14rXqBKWIVYK04mUOy6LccHe3wQsUS3iI=
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f h1:JMEDso3xFUIDULgFJmcrTfyPpigF3NyyaP07Yy8tHmI=
github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a h1:+zYlT8ikLojupnnbSNt3PJWKrBGroi8gSrBeHpV4t9w=
Expand Down Expand Up @@ -204,8 +204,8 @@ github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-2025011
github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ=
github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa h1:7X0ykgD+hmZZeAKqjrN5mSu+11+kYie0Pui6BHHMEow=
github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM=
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU=
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
github.com/openshift/library-go v0.0.0-20241218091209-6018a90c28d0 h1:xf4uw8ShlOfRhtHziMv78jmEhWrWI+thDVJler1i3y4=
github.com/openshift/library-go v0.0.0-20241218091209-6018a90c28d0/go.mod h1:eGSI6tp7yUVr4V2d0WrVt2l5s3iCwAh8Hi0RC9Fo16U=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
Expand Down
21 changes: 19 additions & 2 deletions etcd/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading