OCPBUGS-17286,OCPCLOUD-2222: Merge https://github.com/kubernetes-sigs/cluster-api:v1.5.2 (3290c5a) into master #181
Conversation
…0.20 🌱 Update KIND to v0.20.0
…etcd-management-in-capim 🌱 Improve etcd management in CAPIM
…one-workloadCluster-for-reconcile 🌱 Kcp use one workload cluster for reconcile
…provement-etcd-client 🌱 Change endpoints to endpoint in the etcd client
📖 add release-1.6 schedule document
…rl-uncached 🌱 controller/machine: use unstructured caching client
Signed-off-by: Stefan Büringer buringerst@vmware.com
…pper-1-25 🐛 test/capd: fix kind mapper entry for v1.25.11
Signed-off-by: Stefan Büringer buringerst@vmware.com
…edundant-get-machines 🌱 KCP: drop redundant get machines
…cally-set-kubelet-args-for-CAPD 🌱 Automatically set kubelet args for capd
Signed-off-by: Stefan Büringer buringerst@vmware.com
…-ms-cache-unstructured 🌱 Cache unstructured in Cluster, MD and MS controller
Signed-off-by: Stefan Büringer buringerst@vmware.com
Signed-off-by: Stefan Büringer buringerst@vmware.com
🐛 tilt: set CR logger in tilt-prepare, fix allowed contexts
…unstructured 🌱 KCP: cache unstructured
…y_boostrap_configref 🐛 handle nil pointer in clusterctl describe
🌱 hack/observability: add tempo (for traces)
Signed-off-by: Stefan Büringer buringerst@vmware.com
🌱 util: cache list calls in cluster to objects mapper
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
…precated 🐛 Fix deprecation marker for RolloutAfter
|
@damdo: This pull request references OCPCLOUD-2222 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set. In response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
Rebase looks fine, wondering though, should we squash down a bunch of the commits, we basically have setup, and then a bunch of tweaks to the setup, which I don't really need to care about the history of, WDYT? |
damdo
force-pushed
the
rebase-atop-v1.5.2
branch
from
481e4f2
to
0f9378a
Compare
damdo
force-pushed
the
rebase-atop-v1.5.2
branch
from
0f9378a
to
e1f6a9a
Compare
|
/retest |
3 similar comments
|
/retest |
|
/retest |
|
/retest |
|
/hold |
|
Waiting on the Hypershift fix openshift/hypershift#3087 to |
openshift-ci
bot
added
the
do-not-merge/hold
|
/retitle OCPBUGS-17286,OCPCLOUD-2222: Merge https://github.com/kubernetes-sigs/cluster-api:v1.5.2 (3290c5a) into master |
openshift-ci
bot
changed the title
openshift-ci-robot
added
the
jira/valid-bug
|
@damdo: This pull request references Jira Issue OCPBUGS-17286, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. This pull request references OCPCLOUD-2222 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set. In response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/retest |
|
@damdo: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/lgtm |
|
/unhold |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/tide refresh |
|
@damdo: Jira Issue OCPBUGS-17286: Some pull requests linked via external trackers have merged: The following pull requests linked via external trackers have not merged: These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with Jira Issue OCPBUGS-17286 has not been moved to the MODIFIED state. In response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
No description provided.