Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-15-113437_amd64-2024-11-15_arm64-2024-11-17 #4194

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
Nov 18, 2024
Merged

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-15-113437_amd64-2024-11-15_arm64-2024-11-17 #4194

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
f6e92f3
update last_rebase.sh
Nov 18, 2024
942643c
update changelog
Nov 18, 2024
2b638d6
update microshift/go.mod
Nov 18, 2024
05a08ac
update microshift/vendor
Nov 18, 2024
f8862b3
update etcd/go.mod
Nov 18, 2024
e67e464
update etcd/vendor
Nov 18, 2024
3f22332
update component images
Nov 18, 2024
e6c4ec3
update manifests
Nov 18, 2024
8c2997b
update buildfiles
Nov 18, 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.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=31
KUBE_GIT_VERSION=v1.31.2
KUBE_GIT_COMMIT=e7a7a8d687079e02b36a459284a85cdb27f68e1e
KUBE_GIT_COMMIT=a3f31a4f2c587420f1ddb3bcdb161bf64a8c436b
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.18.0-0.nightly-arm64-2024-11-11-191251
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-17-195718
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.18.0-0.nightly-2024-11-11-144244
OCP_VERSION := 4.18.0-0.nightly-2024-11-15-113437
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:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd
digest: sha256:e5cffbb4b3eca5a9dbc25867b4ab9e7032b1b449de88d2f1f87dc81d876e69eb
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bb0180dd0c4b2758082dc7d998e7e0c3bc1749b859fc1ec3a2b6decbdb4d3a84
digest: sha256:bc50ae401a31f8f2a161abe28da8eb9376407288e3333b3f2e321ffc7c284e9b
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:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902
digest: sha256:9e8571a1e0514fb5adec3cd43f9f81ee7d329f5985cf68a7744c866e15b6f277
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5d43ff04149f27eb50354e424cf99fb62ac9050edc2f93cc702b061aa2c71bed
digest: sha256:14022d906b9ea5d23a3b05e95db5f204d076ce405809a1f1707791d22b61aacb
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.18.0-0.nightly-arm64-2024-11-11-191251"
"base": "4.18.0-0.nightly-arm64-2024-11-17-195718"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb0180dd0c4b2758082dc7d998e7e0c3bc1749b859fc1ec3a2b6decbdb4d3a84"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5cffbb4b3eca5a9dbc25867b4ab9e7032b1b449de88d2f1f87dc81d876e69eb",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc50ae401a31f8f2a161abe28da8eb9376407288e3333b3f2e321ffc7c284e9b"
}
}
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.18.0-0.nightly-2024-11-11-144244"
"base": "4.18.0-0.nightly-2024-11-15-113437"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d43ff04149f27eb50354e424cf99fb62ac9050edc2f93cc702b061aa2c71bed"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e8571a1e0514fb5adec3cd43f9f81ee7d329f5985cf68a7744c866e15b6f277",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14022d906b9ea5d23a3b05e95db5f204d076ce405809a1f1707791d22b61aacb"
}
}
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:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1
digest: sha256:426c53e7b78a2402134dcb6b6f7064f630fb9254fd253b9b824307afffe36330
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9
digest: sha256:7a97e4d9a6dae838f7db1d28102294ff8ecfbf7906d466c3ed34864ccc683e2d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4
digest: sha256:d4ac6d6ff5298c19e5c8b58b5cad9943806742d752995fd0e75cf7722d1c4756

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:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a97e4d9a6dae838f7db1d28102294ff8ecfbf7906d466c3ed34864ccc683e2d
- 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:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:426c53e7b78a2402134dcb6b6f7064f630fb9254fd253b9b824307afffe36330
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:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b
digest: sha256:20448ab31d9c315b183a1f9513ddab38a56bbc09753699d9e706e4cab59f779c
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a
digest: sha256:cdce1fbff25887d02322224b1f6f3554cc53e7c0fce7fd91ce01198aa1090a07
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81
digest: sha256:4e801562a4ae0aa26a165287b5994e572b03bbde42d2afcab975296ebdd35f12

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:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdce1fbff25887d02322224b1f6f3554cc53e7c0fce7fd91ce01198aa1090a07
- 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:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20448ab31d9c315b183a1f9513ddab38a56bbc09753699d9e706e4cab59f779c
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.18.0-0.nightly-arm64-2024-11-11-191251"
"base": "4.18.0-0.nightly-arm64-2024-11-17-195718"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:426c53e7b78a2402134dcb6b6f7064f630fb9254fd253b9b824307afffe36330",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a97e4d9a6dae838f7db1d28102294ff8ecfbf7906d466c3ed34864ccc683e2d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4ac6d6ff5298c19e5c8b58b5cad9943806742d752995fd0e75cf7722d1c4756"
}
}
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.18.0-0.nightly-2024-11-11-144244"
"base": "4.18.0-0.nightly-2024-11-15-113437"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20448ab31d9c315b183a1f9513ddab38a56bbc09753699d9e706e4cab59f779c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdce1fbff25887d02322224b1f6f3554cc53e7c0fce7fd91ce01198aa1090a07",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e801562a4ae0aa26a165287b5994e572b03bbde42d2afcab975296ebdd35f12"
}
}
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.18.0-0.nightly-arm64-2024-11-11-191251"
"base": "4.18.0-0.nightly-arm64-2024-11-17-195718"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50c645fde15c60d0738dc9c51c498ca0ca5032db57982f8c13f3bfbc42014021",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9f02e6b59b8669fe18a6357dfb3327a7433a7cfb6817a8216eeba6b3b4a183d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a812b4d6a977e4260edd57428c794c97c238e01abb08dd4f5bb37d3699513780",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15e2c43fcfccf553f1621f549b13ac9ae4248feb9f44bf0a93ce61b7e42f8574",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f17b19b818aebda04cdd6db74706aa8f3b1e4d6c3f033f6828b7266feaa99e88",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f937b24e7c2c8ba0af25c91ba4485ae6741e985ca02b5a52d47d48b23ea0c37a",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35b5b0c95c874c0beae96e52e6326d45718e956db35e1adbdd6adaf48b443399",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5e7bc5cb361c19f93db9a2450af4356bfd98c2ea76fffe59e287e8ed8be6ea5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c3562fdbc2edf8ed38a607a673a743093e5c26604106c395260ead8a6d5c0a2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4ac6d6ff5298c19e5c8b58b5cad9943806742d752995fd0e75cf7722d1c4756",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26a9a84c88d6732aada0cd2dc31507b1350a02167ce8339e98a554ba841fcd75",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:284c02354fdd067cb60cc8daca54773ef585d557a1ffa1685eeb99d8486eaa2b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:041591fc29b59e0bb1aa43845a12fd5aaf36eca879eb8e92ad23b4c0340a4067",
"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:77e2de1850f4dd0d5c0f1881d6ab131b6dd561b41d399989199ef751cc823098",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76db0e261777098be531ac242ce3076e4c82ab421cc5f7cbc12d81325907b144"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:414f583fa2e289e0542c41d50df2c5f654459b903ad93800ac589f0da73dbb42",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bd8bc9dbd911daefe37fe333d043c0010840d7e330b925687f92a6d0fb54d51"
}
}
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.18.0-0.nightly-2024-11-11-144244"
"base": "4.18.0-0.nightly-2024-11-15-113437"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7186ff2cc5b5580a686b5f80389cbb9310088ab2036241236f2ff6dafcf3145",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40db1c2435c96f5e1dc32ee96b97280f654f3b8497c5871603fc633b0ca5982d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f76142c8f309b5e3794f88d052f3ccf271abdfee71f7cf64ed24909a5f7ef420",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecdcbc49841a709d11cbdba31674a6378762adb8f6fdf61b7cdce245149b122e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff8eeae92e3bf32c38a60615ebabb35bc2a4ea7cd3de6952acba52942adf9447",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dcdd004fcb3d3deaf0caaf007e6e690eb0406958290de8192838077af4227617",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbf9e82a4cda085b646bfa8db344ad1b88e419a8b1f6af633ce23bc34b181c56",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24656efbf11a1a283cc4962bc8c53c184b91f52451193fb63fa32a196992ac0a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e1893efae98b7d575b671af20747ddf0ef2cba59e27ccb45e0b8782fb5049af",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e801562a4ae0aa26a165287b5994e572b03bbde42d2afcab975296ebdd35f12",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b160fb289cd15e7ebc237bcdc7cfa9f2050a4aa572061154ffafab10d3518ca",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b957ced30f7153fe76a617d2e5ee3caf4fedf9a8abc70a2c38ffe9b30bf4b5a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c2c0eb6e0256153eb4fdc92cbc783e73aadb38a733c2bf7cff308776a498070",
"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:d98127535263f9672d3eff5936f5f561ad4cf2b2040781ad9294144a4785efda",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c054e384a82f0f7d83f1642e2831a9c94cf5046663dd64090be095fcd3f1f07a"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa87c54cafa87200d302fa47c000991d742053068859257fde2f05748c99ffc9",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c0d5583c9aeaa27d813271d2da90d19189324d0ab3ee66cecbc8aa8ca526c29"
}
}
Loading