Skip to content

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-13-061822_amd64-2024-03-13_arm64-2024-03-13 #3153

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 8 commits into from
Mar 14, 2024
Merged

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-13-061822_amd64-2024-03-13_arm64-2024-03-13 #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d4c4eb
update last_rebase.sh
Mar 14, 2024
53da7c3
update changelog
Mar 14, 2024
ef48a04
update microshift/go.mod
Mar 14, 2024
f4f8dd4
update microshift/vendor
Mar 14, 2024
e2de9b0
update etcd/go.mod
Mar 14, 2024
bd12322
update etcd/vendor
Mar 14, 2024
7f6936e
update manifests
Mar 14, 2024
0d50b24
update buildfiles
Mar 14, 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
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.16.0-0.nightly-arm64-2024-03-13-012425
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-03-13-041907
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.16.0-0.nightly-2024-03-11-195522
OCP_VERSION := 4.16.0-0.nightly-2024-03-13-061822
2 changes: 1 addition & 1 deletion assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ images:
digest: sha256:016c149f95b194769cc62f6b8b64b86be520fe415d8f56828d864310a1904d23
- name: container-networking-plugins
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8a1480e0b988d4a4c2d6467fc630239809473741632127ea029f06a325136f9d
digest: sha256:79fb8a35ec3c046fc74ae5365076e241e58575fe339fb2ad39645f047f1879d7
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.16.0-0.nightly-arm64-2024-03-13-012425"
"base": "4.16.0-0.nightly-arm64-2024-03-13-041907"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c58df323277e8b78e17e3a578b94625ec7bd56982af7efe78a4618ea0386c89",
Expand Down
4 changes: 2 additions & 2 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.16.0-0.nightly-2024-03-11-195522"
"base": "4.16.0-0.nightly-2024-03-13-061822"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:016c149f95b194769cc62f6b8b64b86be520fe415d8f56828d864310a1904d23",
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a1480e0b988d4a4c2d6467fc630239809473741632127ea029f06a325136f9d"
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79fb8a35ec3c046fc74ae5365076e241e58575fe339fb2ad39645f047f1879d7"
}
}
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-03-13-012425"
"base": "4.16.0-0.nightly-arm64-2024-03-13-041907"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5cacda0977b465c3a7a0a378694ed1f51854c69d72fee7e03bde6d0cc299b11",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-03-11-195522"
"base": "4.16.0-0.nightly-2024-03-13-061822"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca1361901b86a588daceb5483c3810e54772418ba56e9b0bc44f4cc06f24233b",
Expand Down
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.16.0-0.nightly-arm64-2024-03-13-012425"
"base": "4.16.0-0.nightly-arm64-2024-03-13-041907"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50269cc837068c349985e5d7fd5d04960dd9a41d60e546aad7be1aa1fad8c2dc",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-03-11-195522"
"base": "4.16.0-0.nightly-2024-03-13-061822"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7d3025cf0dd7d2f964b7ef9c5f8dd2176814215afba38319b8947f075f1ed2d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3907faea2062c2199b4294bb1ad0471e12cfd02760067f92a4c333f0c521b53d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adead4917f86068fd6271fe6ef2a941d6588ab3cbe10c40a64462b736f1a5d58",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f333bf53a7a7a4429911c6fff2fd7bbc382f84cc3a7b5c401065ec281d20acf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97423459da8caa516c541a605ffc9aa89658b690ed8eb7c768bf3ad56cb6e4ed",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ea11d5cbb889385592663b00e4ec41744a51ef66ab33e8029656e475c34ba59",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4cdc8bef6c6b00bc502517c375c960e2c4d3a65e11ac7a04119be719319a7bf6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:350dda6bdd23e84af41d0e153ab433f320d3637e60ce362fb340a3d82b339866",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7babc0f44ce46e61e257fc730978e071f54c1c487047f4c9a954b50b4002d3b6",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
Expand Down
2 changes: 1 addition & 1 deletion etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ require (
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand Down
38 changes: 29 additions & 9 deletions etcd/vendor/google.golang.org/protobuf/encoding/protojson/decode.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion etcd/vendor/google.golang.org/protobuf/encoding/protojson/doc.go
View file
Open in desktop

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

39 changes: 34 additions & 5 deletions etcd/vendor/google.golang.org/protobuf/encoding/protojson/encode.go
View file
Open in desktop

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

59 changes: 20 additions & 39 deletions etcd/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
View file
Open in desktop

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

Loading