-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3807 from pmtk/rebase-fix-kubelet-rebase/4.17-4.1…
…7.0-0.nightly-2024-08-19-165854_amd64-2024-08-19_arm64-2024-08-21 OCPBUGS-38851: 4.17 rebase with kubelet.yaml fix
- Loading branch information
Showing
25 changed files
with
412 additions
and
287 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.3 | ||
| KUBE_GIT_COMMIT=43740e9179f50acbf24f0c597f78fa9abd121c96 | ||
| KUBE_GIT_COMMIT=6074c2109f1795beb5128593b06ebbbf753998a4 | ||
| KUBE_GIT_TREE_STATE=clean |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-13-025544 | ||
| OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-21-013211 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| OCP_VERSION := 4.17.0-0.nightly-2024-08-09-031511 | ||
| OCP_VERSION := 4.17.0-0.nightly-2024-08-19-165854 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "release": { | ||
| "base": "4.17.0-0.nightly-arm64-2024-08-13-025544" | ||
| "base": "4.17.0-0.nightly-arm64-2024-08-21-013211" | ||
| }, | ||
| "images": { | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cb6b6572cbcdfb12f9bd636e66fc4903d788b61f3bdd7602c780ac4bcaa1118", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e18e55188a989e4ef899146fc8c3d7b79c1a56c22874ee73f5e7eb154eab99d" | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4db38cbf7b2080055fe6d932221f9437965f9e9bf1c75d046fb665af14ac5224", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fffa40c3ab7605bba790cd07aaa51779357a36e2de5e21d495918a1aa9907aba" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "release": { | ||
| "base": "4.17.0-0.nightly-2024-08-09-031511" | ||
| "base": "4.17.0-0.nightly-2024-08-19-165854" | ||
| }, | ||
| "images": { | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02259cfe48802196291cbbb55232ee514388eed26bfe2bd88d099f83eb23f776", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daaad0fa7d8a501c99af9f68771d805d5ddab3265c6cf3fb2b92c66a6cc9bce5" | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dcea567caebccf213f2e2514b762dc765e2efa49c33c7a303085598220f06e0", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e883b4d241418b654756a06b7447c797dcb3632c72303b5d6de22d2ccd23616" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "release": { | ||
| "base": "4.17.0-0.nightly-arm64-2024-08-13-025544" | ||
| "base": "4.17.0-0.nightly-arm64-2024-08-21-013211" | ||
| }, | ||
| "images": { | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612" | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58c00a0833685f014ec56301cb2dc38f708174ee5a7e33609ec7069924a07212", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b503d6ee4b9e53f2dfc5d8e384cdd2e9e87155d6478436401c80cf155f122be", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ff1a140a5081fda372de19ed28c5b61c3fd5a5983a39f16444abfbff175cb24" | ||
| } | ||
| } |
8 changes: 4 additions & 4 deletions
8
assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "release": { | ||
| "base": "4.17.0-0.nightly-2024-08-09-031511" | ||
| "base": "4.17.0-0.nightly-2024-08-19-165854" | ||
| }, | ||
| "images": { | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:364296a51d5c167c141ac5ad9e99210de08d3432cc20ab65f5017cdb6ba1f485", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fd976f5f4982535c7ab0ea3346d1d8c785ec7caa5fb6dae2e240b45dbdb8410", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df47aabf5cd84f98c4c420a4c1cae56225e47907d4370dcab60a0108ad33cd18" | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b409a5f111303d22f23ce179d0a2ae749aea05ddc51f0369226336c92b3a7f2", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a1d91655733b9b064360350945d60b737d7f3bf1aa11b1dc7f9849c770d4f41", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9cab9e93b57378eb594e22c1bf168653247b954258b291a1220d35bdd100e60" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| { | ||
| "release": { | ||
| "base": "4.17.0-0.nightly-arm64-2024-08-13-025544" | ||
| "base": "4.17.0-0.nightly-arm64-2024-08-21-013211" | ||
| }, | ||
| "images": { | ||
| "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f5ceadbb0cc38973a0738da567ad92b4bfe002440830870d0391c6e58ec2203", | ||
| "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14b7112ec12e8b854354426c73aca7cd61d34a278964c29cb60f500a5bb396f2", | ||
| "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed1043d4b938921389829a042a32246ea1699cebf14ba6703d664ca3fc87723", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612", | ||
| "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b2016cbcafb886000ba652248b37a994686232bd87a8423217b3bd56ee83c85", | ||
| "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5147b89a2aa31766bf8c5b30c85bff2d846ac55c99ca15095dffa1021b232a36", | ||
| "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77dafdef6db945f02be5590929ea8bf5638de8c31f12daeab1987f5adf1246e4", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ff1a140a5081fda372de19ed28c5b61c3fd5a5983a39f16444abfbff175cb24", | ||
| "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", | ||
| "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff448737adadea489e77f7ebe8a8a615dda5d1a84a5ca9087158c8482f83f4a7", | ||
| "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99ccba70c29daca7823898b14c87373b55be8f7ac168025beaa9a2c3c57a540", | ||
| "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87a5167d4b1f6efaccebcf009057a80638269b25b86e19ed63fe060175749ae2", | ||
| "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b01d1f1113b385d00feebcb6cc6790830887ce7ba2a6a8f2c00dc90fea8e329", | ||
| "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b43e6f9709e6b691324c0b5385385ba055a26ac7b974ed5f93df11e68869e6a", | ||
| "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51c955743ea21158c3d0af74d35b0be58668f5489f389f0ac3920b0e3523daea", | ||
| "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", | ||
| "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d18a54770d66a28808c2ccc4a7fa4de6a4900906fa53bcfce9132f37aea99f59", | ||
| "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69d8921a0b657cb3e5c675b1d077c99ea4bd4105402a6fcd4bf35ecae690b6b4" | ||
| "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6a5a028f54c11d15faf31c8a5bb72259294ef60ee53c2ea74fbba2434208a2f", | ||
| "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9131d16a5b2e9d6258b9f55804293ba35d282948202e547e8b75d6aaf448d4f1" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| { | ||
| "release": { | ||
| "base": "4.17.0-0.nightly-2024-08-09-031511" | ||
| "base": "4.17.0-0.nightly-2024-08-19-165854" | ||
| }, | ||
| "images": { | ||
| "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30a1a89811d79d955901eaa45d02a62d6ce234491256e6a6e229af9c9935f149", | ||
| "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e06839473a75025488f6118a6928bd6e467cbe3dea9ef46f28972ca55219bcac", | ||
| "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5fe1f43bb9876dbb7b8927913e8d8e75e7691d0b3d09b3f112edf9c572a92e8a", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df47aabf5cd84f98c4c420a4c1cae56225e47907d4370dcab60a0108ad33cd18", | ||
| "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7fc4458b6b521a4e8c78c7307152b5d1de0138a948a8c7337e1046f05c26933", | ||
| "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9adb2bfb4f067b7c48f11797796c4a40aee893899fd20501b523d1d8bd37cf4d", | ||
| "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6818ad23c85cee6133b174c2381a42f6af07c90e9083604bfcf4f01f36b1b33", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9cab9e93b57378eb594e22c1bf168653247b954258b291a1220d35bdd100e60", | ||
| "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", | ||
| "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f50c13dd28d1fb27ca443ddf611c040fea65bbe3e88f4d1bf6cd3da1117485e", | ||
| "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13e890f8679773305aa8e09af3e0c2f56f51a350e43fc8825720e65b09a3dc69", | ||
| "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b202402fad083c9d07eb66f8c9e65bc525dad49eb533233b0a625359e5c41ff", | ||
| "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55391f1e4213d3dad148ff5c20ae21fa30b1b81de142471cd2d80b0cbb036e93", | ||
| "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae578a001a93a11acdef934943e2aa6749bb364f7ad9a30639166e94b87f892e", | ||
| "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d011abc6fd81eb0e06c7e02b6b783e82c18f950d3b888f97292accf158ccbcc", | ||
| "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", | ||
| "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0032f18b30fc97d6c40693c5ac4e4a229cd7e9133a99816cbf77002e3f66b2f7", | ||
| "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef7b4cacf557c2027b7109fe7933d327cd3efb52b595401885d5b85a812705be" | ||
| "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ee126f0550346cc76c469c8ad36810b7cce8ffb3b4637937640c4b0cf740c52", | ||
| "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39e82453d78e579f426aec0dd004eefbea0307a9103a9b85ded2ebf2ecfc2964" | ||
| } | ||
| } |
Oops, something went wrong.