diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 96ad277aad..25b6c0f5d5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2023-07-20-052619 +OCP_VERSION := 4.14.0-0.nightly-arm64-2023-07-25-210314 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index bb7fbbba5d..6cb03ec33f 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2023-07-20-215234 +OCP_VERSION := 4.14.0-0.nightly-2023-07-26-001154 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 81fca46872..c0ef092dd1 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2023-07-20-052619" + "base": "4.14.0-0.nightly-arm64-2023-07-25-210314" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:997bc66ba8f3f37d57c2c96bd214470897839ca4f2db33fe78ab311f93dab286", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beb26fcadbab64068dad686e2494347f6cc507d65e129802ade5a3a9c819e238", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb5e07db75ee89af1041fd75db935a6d46f85e278e74525b751baefabb7c1910", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1c46f404fb2656336debe5fedd5aa2ddf1cb81c4598b792e51abf4c46c698d9", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ab36ca97fa3c5c12ed333ee8fd3f3b4a6f67b9c24dc7a8cd05919573d47fbf6", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:129ef0d9f91c1cd5a9b1b3d31ef4dec0489d80c5abd0ddbb4438dcb57f72eed3", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1168ce05107eb7442555887c36bd9d9e0ecc232446820fbea46fdd9df6fc6c14", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72653b66c4291a720613faf68540e5ecb9597f7efcc2f534bb371a84568bd81b", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccf102b08dd84aee1019f3f6642e356525ed56bc337189d0970ec49a0ec34e03", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d0fdc325b4b1ccd01a09e523136cf722dcc0b95ac192a150482b8d426b34e97", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f427a61494fd186413a426e64731e1962f1f8e440ff121df1a9624cf8af98fe5", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:798b1dd2aaf14e94cc7f9bdbf58b9cc4cabd4269f6a1f89481f77d8727551217", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be8c7b4d68bbcf58c6c6617bd8cd9daae842663c3e88ab109a1eacb5d6e379fa", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47ca2a0be99ddb306c426e3d58ff70f42e61ffe598af1a1eb26defab6278a639", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:f676e20b8ecdbe9f5fc994e2ff236a02d2afe666bf325e8ac02cd3a043df107e", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:71d42a2b26fca9690036c95e54aa3641702c4dc7ba1912f8804d777320f9fbf8", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:3c63c06561f20f5ead423946c6cc22030c397f0fe190004e6b5ccdb3bfaccdc4", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99317a95080d79eb5430799a1adf7198abb09818a9031b44ebe00ac85919827", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11b62223364340222c33d49a6a554b677277b2aac6c5c17a22ad632d65ab4190", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c8aa4c32d837a6e703b4e78d8de647e2f7c12587ed79c62565fdc36cb22e115" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c01de2ac10e42ba9db7ed23bd48676f604623fae76690a7a933fc6c89e30a0d1", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16cef2ae8296a69c10456a854278e2170308749fc85c4aeb4541e5d7710de974", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:587a039aa3c4a7fac7b049743a3e4886aaef4394f62f00cdef70950837adb16c" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index ec477b8cc1..cf0cb07c58 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-2023-07-20-215234" + "base": "4.14.0-0.nightly-2023-07-26-001154" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fadd0485ede81d642109142a0baffddabc9d841c8d519a24cdd01eb05b29d2c1", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab5ffd476330032c5636667997d427bcb9df449af62c7524764e3db70bab8cff", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2aabff0b600729b09627cbc85825720d19006ae9f3be5eac555d3d75c746710", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e9caa594bfc72ca10445e45acb279d3267c6e53e7b79189b03b41f71e758a92", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cb2c7434e9efac3be32f61eb762746688425b4854c42b58bf30723e1ff6c676", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:724e78c5fefd7433d3120d52e2bcc1f6814123f825896cd3ed37880e732f2185", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b53086cc2268903df4cf9108317663bf35697e28a4a1b726dd4e6c15bf49ae1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25b55b9980509d9845171fb39554ca66c6c8771182a14331986214fd482b7f25", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdffb5b5757978800ccd2ccbbb182593a175fc1e9149fbc752da49a86660459f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28504e275b2642536c091ccff83918f25bb60b0b74fdcc8f9a8b1e08697358e6", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab9196052661c799f157668b089a3ec382cbcdaef6bf4341a432790f79b34a5d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0ae209c3966ec795e1502b69d0260311ac008d863d750a82b5491c45357fe49", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec37cb9ba0e30ca4a70fdbaf7dca3ec771c553d221ec31758b3e9937f81d8a5e", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0b3e1dc36f07f876a59535a1bc9b5325da507d4314eae00758d1e8b02843fd6", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:f676e20b8ecdbe9f5fc994e2ff236a02d2afe666bf325e8ac02cd3a043df107e", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:71d42a2b26fca9690036c95e54aa3641702c4dc7ba1912f8804d777320f9fbf8", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:3c63c06561f20f5ead423946c6cc22030c397f0fe190004e6b5ccdb3bfaccdc4", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5912945ef16f470e895902739d520fa275b6b277b1d24727d49ecad160680f6", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6254006efd598427056b00f34a51076c87dac98d6d959a9548eb500da7c53c42", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e86e7cd7cc77074ba7f57bdf45d3b43f634acb4d8ac98158ab4ea83ccea2a8e" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0da6a3ae37a10924c7bf900cbd68b953ae38afca510c0354a8b478a44cbdfe73", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:012b60f11c4303bb13f4fa727b1ec494b07888570d0d400890f23750930c85d3", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b89b0461f8d5672b254223edbf30e790dcfcbe8a1717b9fdad215000dfea5bf" } } diff --git a/go.mod b/go.mod index e8e1bef400..e056b01df8 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/openshift/api v0.0.0-20230703134140-1c2204a0195c github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb - github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15 + github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084 github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb github.com/openshift/route-controller-manager v0.0.0-20230720095017-5710699f4e7e github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index fa9a21c497..81b5ca5b75 100644 --- a/go.sum +++ b/go.sum @@ -513,8 +513,8 @@ github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533 h1:mh github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI= github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs= -github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15 h1:c0rEyhtLJ/GIHIGvIoeNhufVD7rtrSgCIKQKQzvZ7xU= -github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g= +github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084 h1:CjBZbphEb/DshnvH7Ms/aY/FpewUqFWnD17BURRQtgs= +github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g= github.com/openshift/kubernetes v0.0.0-20230714130253-4aaeaec06c95 h1:mLt4kQRVu95usOEiBNKJUrpxQHEuw/F+EYxHIK/wB08= github.com/openshift/kubernetes v0.0.0-20230714130253-4aaeaec06c95/go.mod h1:SQgN09RomqsG6haNxyFe9QXKtmbmITfRZYHTNZYmGEE= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230525153147-77c90ab82b46 h1:RfVBJVSRy3Wk8j0lB9J1RbokSmg/K0Z43tygihlDUZo= diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index fc94584549..764ec94cd4 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28504e275b2642536c091ccff83918f25bb60b0b74fdcc8f9a8b1e08697358e6" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec37cb9ba0e30ca4a70fdbaf7dca3ec771c553d221ec31758b3e9937f81d8a5e" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index 91459b2b11..cd1a5fe4c7 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d0fdc325b4b1ccd01a09e523136cf722dcc0b95ac192a150482b8d426b34e97" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be8c7b4d68bbcf58c6c6617bd8cd9daae842663c3e88ab109a1eacb5d6e379fa" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/assets.yaml b/scripts/auto-rebase/assets.yaml index 45fcdc2035..754972d123 100644 --- a/scripts/auto-rebase/assets.yaml +++ b/scripts/auto-rebase/assets.yaml @@ -22,7 +22,7 @@ assets: - file: update-node-resolver.sh - dir: components/openshift-router/ - src: cluster-ingress-operator/assets/router/ + src: cluster-ingress-operator/pkg/manifests/assets/router/ files: - file: cluster-role-binding.yaml - file: cluster-role.yaml diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 2c762d67c1..be9fdb35a0 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,47 +1,159 @@ -- cluster-ingress-operator embedded-component 0cdc132376aab6f665e8f228bb07378357bb1e48 to 80cfabf2f60148d4a169b384a54105eddebe3e0c - - aa400d8 2023-05-18T17:46:47-04:00 canary: Tolerate infra node NoExecute taint - -- cluster-kube-apiserver-operator embedded-component 2e060d6686e4e6ba375a68a85268c9ed0ebbed9b to 84e3487b23f51cad656e5620d45c3024d9db0a1c - - fc239a9 2023-07-19T10:58:39+02:00 OCPBUGS-13635: make webhook connection failure a warning in log - -- cluster-network-operator embedded-component fd05db194cae71d99500eef3b9042c20b8d912ee to 09c0898787721394d1fc6add1dd0388878a53bee - - ceac0bb 2023-07-19T09:32:53+02:00 ovn-k: Configure dns service namespace and name - - aef22da 2023-07-17T09:56:56+05:30 Skip rendering 0.0.0.0/0 for cluster proxy status - - 720bba6 2023-07-12T17:29:29+02:00 Add --enable-multi-external-gateway flag, since we disabled this feature on ovn-k by default. Don't enable this feature for microshift. - -- cluster-openshift-controller-manager-operator embedded-component 08ed2c75cd3ea2995722d7c7a8a3a02f9ac426ca to e004b58bcbe1e592746ee1dabee60d41234da3d8 - - 43b7db8 2023-06-09T21:31:34+02:00 Revert "Revert "OCPBUGS-13895: [WRKLDS-730] route-controller-manager deployment updates"" - -- cluster-policy-controller embedded-component 922f9ad6819ff2aa24d17f367bd04a6226d03924 to 838f4d0c9d151be3d60ce1947822398194b96f1a - - a6007b8 2023-07-20T13:17:03+03:00 Remove debugs logs in workqueuebucket - - 2a9b7b4 2023-07-19T10:33:07+03:00 Add more logs for queue operations - -- machine-config-operator embedded-component d0c0670f38dcf95d1d267879614ad09e37e58d51 to 2bcdd7fb108585396a08c5b2c17d2c804a5c4613 - - 57b5d37b 2023-07-18T20:34:28+02:00 templates: launch mcd container during firstboot with --pid=host - - ae8730b5 2023-07-18T12:10:58+02:00 kubevirt: Configure IPv6 arp proxy default gw - - a622fbed 2023-07-18T12:10:58+02:00 kubevirt: Add owners - - 6c3e78cb 2023-07-17T13:33:17-04:00 daemon: Copy matching binary to host, re-exec with it - - afdd9a35 2023-07-16T16:16:52+03:00 MGMT-14843: ovs-configuration service should copy the statically configured address even if the method isn't manual. nmstate connection files allow configuring static IPs on an interface together with DHCP, see https://github.com/nmstate/nmstate/pull/2303 By cloning the existing connection file we should get both IPs (static and the one from DHCP) on the vr-ex bridge. - - a232ed05 2023-07-13T09:15:42-04:00 daemon: Run firstboot as a container image too - - 59d2b1a2 2023-07-13T08:42:13-04:00 build-sys: Drop setting CGO_ENABLED=0 - - ccaf1603 2023-07-13T08:41:42-04:00 4.13: use rhel9 builder for daemon binary - - 1269a987 2023-07-12T12:13:46+02:00 OCPBUGS-15613: Soften grep pattern for ingress default router - - d72f74ba 2023-07-11T11:31:32-04:00 daemon: removed login monitor - - b7d030ec 2023-07-07T19:49:45-03:00 OpenStack: fix IPv6 configuration with additional network - - cb7f42e8 2023-06-29T06:39:14-04:00 operator: Stop mounting /etc/kubernetes/ca.crt - -- route-controller-manager embedded-component 38d9ec83ce464e9198af05918ab03a7995a11866 to 5710699f4e7ec00a14fa3fe600b81d0f722fc1ff - - 36213e7 2023-07-19T16:11:59+02:00 [WRKLDS-730] add dummy flags needed for a switch to library-go server and ControlerCommand - -- oc image-amd64 b23646318f85cd2f03853137363702655c8a8346 to 26815bf97bc3b9abd5189e00f0572f72650f254f - - 29abd121 2023-07-18T01:27:31-07:00 pkg/cli/admin/release/extract: Centralize manifest extraction - -- router image-amd64 6cef4d006b96779a78d752909203812a451e8d27 to 6117b7ba414c7073274e2d19c43082031393ccd7 - - c9cee47 2023-04-14T14:55:21+01:00 RFE-3007: Expose option-contstats as an unsupported option - -- oc image-arm64 b23646318f85cd2f03853137363702655c8a8346 to 26815bf97bc3b9abd5189e00f0572f72650f254f - - 29abd121 2023-07-18T01:27:31-07:00 pkg/cli/admin/release/extract: Centralize manifest extraction - -- router image-arm64 6cef4d006b96779a78d752909203812a451e8d27 to 6117b7ba414c7073274e2d19c43082031393ccd7 - - c9cee47 2023-04-14T14:55:21+01:00 RFE-3007: Expose option-contstats as an unsupported option +- cluster-ingress-operator embedded-component 80cfabf2f60148d4a169b384a54105eddebe3e0c to 83c9c4179f35ed2c79537f81f7e38cf0221638cb + - 0b761da 2023-07-20T15:14:49-04:00 Replace bindata using embed + - 8184bce 2023-07-20T09:40:07-03:00 RFE-3765: Add support to allow modification of HAProxy log length when using a sidecar. + - 1c68273 2023-07-19T14:15:04-04:00 NE-1183: Rename unit tests for specific functions + - f2327ab 2023-07-05T17:00:05-04:00 NE-1187: Use t.Run for table-driven tests + - 5f6efd1 2023-06-21T22:40:01-03:00 RFE-3765: Updating vendor files, 00-custom-resource-definition.yaml and bindata.go + +- cluster-kube-apiserver-operator embedded-component 84e3487b23f51cad656e5620d45c3024d9db0a1c to 71f29f6df5edbc47aeb666de399a960685241e29 + - ac3095b 2023-07-24T17:14:44+02:00 bump(*): vendor update + - 89b4856 2023-07-20T15:32:18-04:00 go mod vendor + - d5f7b3e 2023-07-20T15:32:18-04:00 remove dependency on typed prometheus client + +- cluster-network-operator embedded-component 09c0898787721394d1fc6add1dd0388878a53bee to d4f68c0e55c0f337a47ea7d9f5caaf239bc7b13f + - 3a696e9 2023-07-14T09:56:47-07:00 update openshift/api to commit for maxLogFiles + - aa22e33 2023-07-14T09:56:38-07:00 Revert "Revert "OCPBUGS-10765: Remove oldest ovn acl log files when file limit exceeded"" + - ef1f70a 2023-07-14T11:59:06-04:00 Add logic to pick the openshift-sdn shims from right directories + - 226e096 2023-07-14T11:58:04-04:00 Add logic to pick the ovn-k8s-cni-overlay binary from the right source directory + +- cluster-policy-controller embedded-component 838f4d0c9d151be3d60ce1947822398194b96f1a to 8501bc8c4084b57cfa8978afd533cc912f17cf31 + - af876fe 2023-07-24T08:58:15+03:00 Adjust logs per generic troubleshooting + - b101671 2023-07-20T12:56:58+03:00 Add timeout into cache sync wait to prevent hanging forever + +- machine-config-operator embedded-component 2bcdd7fb108585396a08c5b2c17d2c804a5c4613 to 3fb306d53f555ab6125d82cc790833f8a7bffa30 + - b7e71493 2023-07-21T15:59:11-04:00 fix metrics test + - 48ac23ed 2023-07-18T11:16:28-04:00 adds podman builder and clarifies buildah + - bfb44686 2023-07-18T11:16:28-04:00 remove skopeo dependency for custom build pod + - 692f814b 2023-07-18T11:16:22-04:00 introduces buildcontroller with image builder backends + - a2cf4589 2023-07-17T10:53:40-04:00 vendor deps + - c20970c5 2023-07-17T10:53:40-04:00 we longer have 'legacy' OS containers + - d27c3dfc 2023-07-17T10:53:37-04:00 Adds some constants for layering and a helper. + - 010a23a1 2023-07-17T10:52:54-04:00 controller/common: image stream helpers and consts + - 3a4f2d4f 2023-07-17T10:52:10-04:00 Add build controller for layered/image builds + - f0368457 2023-07-17T10:52:10-04:00 Add structures defining pool-owned build resources + - 80e7b4db 2023-07-17T10:27:26-04:00 keep track of certs in ControllerConfigStatus + - 85b297c1 2023-07-10T09:53:55-04:00 daemon: Remove old legacy OS update path + +- service-ca-operator embedded-component f0bd313003d3d79593b44936fb7cf0bab2a6daae to 46c0577bee18108d6cc7743b4876830630f88442 + - 067e863 2023-07-20T11:24:01+02:00 bump kube to 1.27.1 + +- oc image-amd64 26815bf97bc3b9abd5189e00f0572f72650f254f to 643b040e4f38d2d5f353ddbc839195e3935c712c + - 1beb5999 2023-07-25T01:04:52+02:00 go mod vendor + - a9848279 2023-07-25T01:04:52+02:00 introduce plugin and plugin shadowing tests for oc + - d565f6de 2023-07-25T01:04:52+02:00 inject dependencies into NewDefaultOcCommand with KubectlOptions + - 2f959e4f 2023-07-24T12:27:47-07:00 pkg/cli/admin/upgrade: Newlines after --allow-upgrade-with-warnings errors + - 2f0a6285 2023-07-20T16:28:44+02:00 Fix typo in /var/log folder + - 5c665e90 2023-07-20T14:09:18+03:00 Bump oc to 1.27.4 + - f1c9d17c 2023-07-20T14:05:26+03:00 Add profiling functionality and flags in oc + - 9bb67c0f 2023-07-14T16:50:55+03:00 login: improve usage message for --web option + +- ovn-kubernetes image-amd64 567aee061b529bef8671e0423fda2242fdc6f568 to 7d9a0d3920e6844b86681f455e30efdf6130c7a9 + - 712978d 2023-07-21T09:55:08+02:00 Remove node check for syncing cloud private ip config + - 6367071 2023-07-20T10:57:36+02:00 Enable inactivity check on ovndb connection + - a4194bf 2023-07-20T10:57:36+02:00 testing: rework libovsdb helpers for libovsdb bump + - 5bf7264 2023-07-20T10:57:36+02:00 vendor: bump libovsdb to 6785b52d4020 + - 6745d66 2023-07-20T10:22:49+02:00 Fix logging for release IP msg + - c94d11f 2023-07-19T17:32:39+00:00 Add secondary network namespace address set UTs + - 30f005f 2023-07-19T16:41:24+00:00 Replace child stop channels with cancelable contexts + - 8c2c616 2023-07-19T16:41:23+00:00 Enable layer2 interconnect e2e tests + - 0deb88c 2023-07-19T16:41:23+00:00 Enable layer2 interconnect support + - 69242d1 2023-07-19T16:41:23+00:00 Add IC support to layer2 network controller + - b21b59d 2023-07-19T16:41:23+00:00 Fetch network ID from any node in zone IC handler + - e50baa9 2023-07-19T16:41:22+00:00 Move zoneICHandler to base network controller + - eed5169 2023-07-19T16:41:22+00:00 Handle node events in layer2 controller + - ced3a5a 2023-07-19T16:41:22+00:00 Move Start/Stop entry points to the specific layer2 controllers + - 9fbc909 2023-07-19T16:41:22+00:00 Rename base layer2 event handler + - a11909f 2023-07-19T16:41:21+00:00 Move Multinetpol record event implementation to base handler + - 899d164 2023-07-19T16:41:21+00:00 Cache network ID in IC handler + - ed83605 2023-07-19T16:41:21+00:00 Fix missing addLogicalPortToNetworkForNAD error + - fd7267c 2023-07-19T14:27:21+02:00 kubevirt, refactor: Reuse ippool re-fill logic + - e1550f5 2023-07-19T14:27:21+02:00 kubevirt: Handle adding new node + - dbb6770 2023-07-19T14:27:21+02:00 test, e2e: test kubevirt live migration + - aa73f6a 2023-07-19T14:27:21+02:00 doc: Add KubeVirt live migration + - 8545136 2023-07-19T14:27:21+02:00 kubevirt, routing: Use point to point routing + - 01cafb2 2023-07-19T14:27:21+02:00 kubevirt, dhcp: Add DHCP with ARP Proxy to LSP + - 55bd70c 2023-07-19T14:27:21+02:00 pod, controller: Copy vm ovn pod annotation + - 39b16f4 2023-07-19T14:27:21+02:00 cni: Skip net configuration on live migratable pod + - 2bb60d4 2023-07-14T22:49:29-04:00 correct logs for Route delete + - 8e95a64 2023-07-14T12:07:46-04:00 Handle pod IPs correctly for address set selector + - f4822af 2023-07-14T15:57:35+02:00 Remove double quote in test name, it can cause logs collection error: [error]Artifact path is not valid: /ovn-control-plane/e2e-dbs/should_provide_Internet_connection_continuously_when_pod_running_master_instance_of_ovnkube-control-plane_is_killed"-nettest-9947/ovn-control-plane-conf.db. Contains the following character: Double quote " + - 4fef43f 2023-07-14T15:57:35+02:00 Fix unit test cleanup: shutdown WatchFactory, call shutdown after every init. + - 65c2310 2023-07-14T15:57:35+02:00 Update external_gateway_apb_test.go to check policy status together with db state, simplify policy creation. + - e64f04d 2023-07-14T15:57:34+02:00 fix external gateway test that cleans up namespace annotation. It used to fail parsing namespace annotations, because they were empty. Add RunAPBExternalPolicyController call to handle apbroutes. + - b07cae5 2023-07-14T15:57:34+02:00 Fix deleting gateway pod with both CR and annotations. In this case gateway pod ip should be cleaned up. + - 0beaf4e 2023-07-14T15:57:34+02:00 fix gateway test annotatePodForGateway usage: when it was called for ip without double quotes, the following error occurred: + - de79d4d 2023-07-14T15:57:34+02:00 Update apbroute status with retry. + - 105fb86 2023-07-14T15:57:34+02:00 allow External Gateway tests with more detailed focus. + - 72ac3a5 2023-07-14T15:57:34+02:00 move gatewayInfoList to a sub-package to ensure correct usage + - c7ff20e 2023-07-14T15:57:34+02:00 Fix repair logic to work with the new controller design. Now repair will initialize policies cache by handling every existing policy, and return existing routes for future cleanup. Make sure Repair can return error, because if it fails, some stale routes may be left in the system, and it can't be fixed by any controller. Fix buildExternalIPGatewaysFromAnnotations function to only set dynamic gateway ips for pod in the target namespace instead of all pods. + - 2ac88df 2023-07-14T15:57:29+02:00 Update apbroute controller to fix cache inconsistencies and races with namespace and pod handlers. For cache fix, add routePolicySyncCache that stores the lates state for every target pod, and allows retries. For races add policyReferencedObjects cache to allow policy handler share the references objects it used for the latest config. + - c8c8b06 2023-07-14T13:13:13+02:00 use false in OnAdd in WithUpdateHandlingForObjReplace + - c08382b 2023-07-14T13:12:27+02:00 Add unit test for empty cloud private ip config + - 8dd5d2e 2023-07-14T13:12:27+02:00 Use CloudPrivateIPConfig sync function + - 152ae1e 2023-07-14T13:12:27+02:00 Remove stale egressip status entry + - 11f93d1 2023-07-14T09:22:56+02:00 Revert "Disable UTs for APB Temporarily" + - 9378b99 2023-07-13T20:31:39+02:00 Add mlb entry to kind.sh --help + +- service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae to 46c0577bee18108d6cc7743b4876830630f88442 + - 067e863 2023-07-20T11:24:01+02:00 bump kube to 1.27.1 + +- oc image-arm64 26815bf97bc3b9abd5189e00f0572f72650f254f to 643b040e4f38d2d5f353ddbc839195e3935c712c + - 1beb5999 2023-07-25T01:04:52+02:00 go mod vendor + - a9848279 2023-07-25T01:04:52+02:00 introduce plugin and plugin shadowing tests for oc + - d565f6de 2023-07-25T01:04:52+02:00 inject dependencies into NewDefaultOcCommand with KubectlOptions + - 2f959e4f 2023-07-24T12:27:47-07:00 pkg/cli/admin/upgrade: Newlines after --allow-upgrade-with-warnings errors + - 2f0a6285 2023-07-20T16:28:44+02:00 Fix typo in /var/log folder + - 5c665e90 2023-07-20T14:09:18+03:00 Bump oc to 1.27.4 + - f1c9d17c 2023-07-20T14:05:26+03:00 Add profiling functionality and flags in oc + - 9bb67c0f 2023-07-14T16:50:55+03:00 login: improve usage message for --web option + +- ovn-kubernetes image-arm64 567aee061b529bef8671e0423fda2242fdc6f568 to 7d9a0d3920e6844b86681f455e30efdf6130c7a9 + - 712978d 2023-07-21T09:55:08+02:00 Remove node check for syncing cloud private ip config + - 6367071 2023-07-20T10:57:36+02:00 Enable inactivity check on ovndb connection + - a4194bf 2023-07-20T10:57:36+02:00 testing: rework libovsdb helpers for libovsdb bump + - 5bf7264 2023-07-20T10:57:36+02:00 vendor: bump libovsdb to 6785b52d4020 + - 6745d66 2023-07-20T10:22:49+02:00 Fix logging for release IP msg + - c94d11f 2023-07-19T17:32:39+00:00 Add secondary network namespace address set UTs + - 30f005f 2023-07-19T16:41:24+00:00 Replace child stop channels with cancelable contexts + - 8c2c616 2023-07-19T16:41:23+00:00 Enable layer2 interconnect e2e tests + - 0deb88c 2023-07-19T16:41:23+00:00 Enable layer2 interconnect support + - 69242d1 2023-07-19T16:41:23+00:00 Add IC support to layer2 network controller + - b21b59d 2023-07-19T16:41:23+00:00 Fetch network ID from any node in zone IC handler + - e50baa9 2023-07-19T16:41:22+00:00 Move zoneICHandler to base network controller + - eed5169 2023-07-19T16:41:22+00:00 Handle node events in layer2 controller + - ced3a5a 2023-07-19T16:41:22+00:00 Move Start/Stop entry points to the specific layer2 controllers + - 9fbc909 2023-07-19T16:41:22+00:00 Rename base layer2 event handler + - a11909f 2023-07-19T16:41:21+00:00 Move Multinetpol record event implementation to base handler + - 899d164 2023-07-19T16:41:21+00:00 Cache network ID in IC handler + - ed83605 2023-07-19T16:41:21+00:00 Fix missing addLogicalPortToNetworkForNAD error + - fd7267c 2023-07-19T14:27:21+02:00 kubevirt, refactor: Reuse ippool re-fill logic + - e1550f5 2023-07-19T14:27:21+02:00 kubevirt: Handle adding new node + - dbb6770 2023-07-19T14:27:21+02:00 test, e2e: test kubevirt live migration + - aa73f6a 2023-07-19T14:27:21+02:00 doc: Add KubeVirt live migration + - 8545136 2023-07-19T14:27:21+02:00 kubevirt, routing: Use point to point routing + - 01cafb2 2023-07-19T14:27:21+02:00 kubevirt, dhcp: Add DHCP with ARP Proxy to LSP + - 55bd70c 2023-07-19T14:27:21+02:00 pod, controller: Copy vm ovn pod annotation + - 39b16f4 2023-07-19T14:27:21+02:00 cni: Skip net configuration on live migratable pod + - 2bb60d4 2023-07-14T22:49:29-04:00 correct logs for Route delete + - 8e95a64 2023-07-14T12:07:46-04:00 Handle pod IPs correctly for address set selector + - f4822af 2023-07-14T15:57:35+02:00 Remove double quote in test name, it can cause logs collection error: [error]Artifact path is not valid: /ovn-control-plane/e2e-dbs/should_provide_Internet_connection_continuously_when_pod_running_master_instance_of_ovnkube-control-plane_is_killed"-nettest-9947/ovn-control-plane-conf.db. Contains the following character: Double quote " + - 4fef43f 2023-07-14T15:57:35+02:00 Fix unit test cleanup: shutdown WatchFactory, call shutdown after every init. + - 65c2310 2023-07-14T15:57:35+02:00 Update external_gateway_apb_test.go to check policy status together with db state, simplify policy creation. + - e64f04d 2023-07-14T15:57:34+02:00 fix external gateway test that cleans up namespace annotation. It used to fail parsing namespace annotations, because they were empty. Add RunAPBExternalPolicyController call to handle apbroutes. + - b07cae5 2023-07-14T15:57:34+02:00 Fix deleting gateway pod with both CR and annotations. In this case gateway pod ip should be cleaned up. + - 0beaf4e 2023-07-14T15:57:34+02:00 fix gateway test annotatePodForGateway usage: when it was called for ip without double quotes, the following error occurred: + - de79d4d 2023-07-14T15:57:34+02:00 Update apbroute status with retry. + - 105fb86 2023-07-14T15:57:34+02:00 allow External Gateway tests with more detailed focus. + - 72ac3a5 2023-07-14T15:57:34+02:00 move gatewayInfoList to a sub-package to ensure correct usage + - c7ff20e 2023-07-14T15:57:34+02:00 Fix repair logic to work with the new controller design. Now repair will initialize policies cache by handling every existing policy, and return existing routes for future cleanup. Make sure Repair can return error, because if it fails, some stale routes may be left in the system, and it can't be fixed by any controller. Fix buildExternalIPGatewaysFromAnnotations function to only set dynamic gateway ips for pod in the target namespace instead of all pods. + - 2ac88df 2023-07-14T15:57:29+02:00 Update apbroute controller to fix cache inconsistencies and races with namespace and pod handlers. For cache fix, add routePolicySyncCache that stores the lates state for every target pod, and allows retries. For races add policyReferencedObjects cache to allow policy handler share the references objects it used for the latest config. + - c8c8b06 2023-07-14T13:13:13+02:00 use false in OnAdd in WithUpdateHandlingForObjReplace + - c08382b 2023-07-14T13:12:27+02:00 Add unit test for empty cloud private ip config + - 8dd5d2e 2023-07-14T13:12:27+02:00 Use CloudPrivateIPConfig sync function + - 152ae1e 2023-07-14T13:12:27+02:00 Remove stale egressip status entry + - 11f93d1 2023-07-14T09:22:56+02:00 Revert "Disable UTs for APB Temporarily" + - 9378b99 2023-07-13T20:31:39+02:00 Add mlb entry to kind.sh --help + +- service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae to 46c0577bee18108d6cc7743b4876830630f88442 + - 067e863 2023-07-20T11:24:01+02:00 bump kube to 1.27.1 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index e19816509e..8f857d99a5 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,36 +1,36 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component eaaf7260464bd6cb6126dfd7259cb6217eb25340 https://github.com/openshift/cluster-dns-operator embedded-component 47be7b57fbc7eecdd91bc3960f6bc4d7d0304133 -https://github.com/openshift/cluster-ingress-operator embedded-component 80cfabf2f60148d4a169b384a54105eddebe3e0c -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 84e3487b23f51cad656e5620d45c3024d9db0a1c +https://github.com/openshift/cluster-ingress-operator embedded-component 83c9c4179f35ed2c79537f81f7e38cf0221638cb +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 71f29f6df5edbc47aeb666de399a960685241e29 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 5f49f59c88c963d97dd90643e7c9fb7ef1820d0c https://github.com/openshift/cluster-kube-scheduler-operator embedded-component db92b6d9fcf410aa24efc4a70c4114925bb7b797 -https://github.com/openshift/cluster-network-operator embedded-component 09c0898787721394d1fc6add1dd0388878a53bee +https://github.com/openshift/cluster-network-operator embedded-component d4f68c0e55c0f337a47ea7d9f5caaf239bc7b13f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e004b58bcbe1e592746ee1dabee60d41234da3d8 -https://github.com/openshift/cluster-policy-controller embedded-component 838f4d0c9d151be3d60ce1947822398194b96f1a +https://github.com/openshift/cluster-policy-controller embedded-component 8501bc8c4084b57cfa8978afd533cc912f17cf31 https://github.com/openshift/csi-external-snapshotter embedded-component 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/etcd embedded-component 5a36b9b6b329d92d7c26d1c944e6b1192f9d1523 https://github.com/openshift/kubernetes embedded-component 4aaeaec06c95e0a1a868695792c256d8f0158075 -https://github.com/openshift/machine-config-operator embedded-component 2bcdd7fb108585396a08c5b2c17d2c804a5c4613 +https://github.com/openshift/machine-config-operator embedded-component 3fb306d53f555ab6125d82cc790833f8a7bffa30 https://github.com/openshift/openshift-controller-manager embedded-component 80c4923e0b2014ec8b8a6845c21078e6cc036f91 https://github.com/openshift/route-controller-manager embedded-component 5710699f4e7ec00a14fa3fe600b81d0f722fc1ff -https://github.com/openshift/service-ca-operator embedded-component f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-amd64 26815bf97bc3b9abd5189e00f0572f72650f254f +https://github.com/openshift/service-ca-operator embedded-component 46c0577bee18108d6cc7743b4876830630f88442 +https://github.com/openshift/oc image-amd64 643b040e4f38d2d5f353ddbc839195e3935c712c https://github.com/openshift/coredns image-amd64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/csi-external-snapshotter image-amd64 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/csi-external-snapshotter image-amd64 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/csi-external-snapshotter image-amd64 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/router image-amd64 6117b7ba414c7073274e2d19c43082031393ccd7 https://github.com/openshift/kube-rbac-proxy image-amd64 86f31e2de5221ed4acd6509fa7a010a286089f1f -https://github.com/openshift/ovn-kubernetes image-amd64 567aee061b529bef8671e0423fda2242fdc6f568 +https://github.com/openshift/ovn-kubernetes image-amd64 7d9a0d3920e6844b86681f455e30efdf6130c7a9 https://github.com/openshift/kubernetes image-amd64 4aaeaec06c95e0a1a868695792c256d8f0158075 -https://github.com/openshift/service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-arm64 26815bf97bc3b9abd5189e00f0572f72650f254f +https://github.com/openshift/service-ca-operator image-amd64 46c0577bee18108d6cc7743b4876830630f88442 +https://github.com/openshift/oc image-arm64 643b040e4f38d2d5f353ddbc839195e3935c712c https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/csi-external-snapshotter image-arm64 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/csi-external-snapshotter image-arm64 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/csi-external-snapshotter image-arm64 712bf7c316adfa0a3c8afc56d1db23abfadad58e https://github.com/openshift/router image-arm64 6117b7ba414c7073274e2d19c43082031393ccd7 https://github.com/openshift/kube-rbac-proxy image-arm64 86f31e2de5221ed4acd6509fa7a010a286089f1f -https://github.com/openshift/ovn-kubernetes image-arm64 567aee061b529bef8671e0423fda2242fdc6f568 +https://github.com/openshift/ovn-kubernetes image-arm64 7d9a0d3920e6844b86681f455e30efdf6130c7a9 https://github.com/openshift/kubernetes image-arm64 4aaeaec06c95e0a1a868695792c256d8f0158075 -https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae +https://github.com/openshift/service-ca-operator image-arm64 46c0577bee18108d6cc7743b4876830630f88442 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index ccb44b95d4..549eb94ed1 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-07-20-215234" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-07-20-052619" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.13.1-5" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-07-26-001154" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-07-25-210314" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.13.1-5" diff --git a/vendor/github.com/openshift/cluster-policy-controller/pkg/quota/clusterquotareconciliation/reconciliation_controller.go b/vendor/github.com/openshift/cluster-policy-controller/pkg/quota/clusterquotareconciliation/reconciliation_controller.go index c2079bd7be..f542137792 100644 --- a/vendor/github.com/openshift/cluster-policy-controller/pkg/quota/clusterquotareconciliation/reconciliation_controller.go +++ b/vendor/github.com/openshift/cluster-policy-controller/pkg/quota/clusterquotareconciliation/reconciliation_controller.go @@ -201,9 +201,7 @@ func (c *ClusterQuotaReconcilationController) Sync(discoveryFunc resourcequota.N return } - // Something has changed, so track the new state and perform a sync. - klog.V(2).Infof("syncing resource quota controller with updated resources from discovery: %v", newResources) - oldResources = newResources + klog.V(2).Infof("syncing resource quota controller with updated resources from discovery: %s", printDiff(oldResources, newResources)) // Ensure workers are paused to avoid processing events before informers // have resynced. @@ -215,13 +213,45 @@ func (c *ClusterQuotaReconcilationController) Sync(discoveryFunc resourcequota.N utilruntime.HandleError(fmt.Errorf("failed to sync resource monitors: %v", err)) return } - if c.quotaMonitor != nil && !cache.WaitForCacheSync(ctx.Done(), func() bool { return c.quotaMonitor.IsSynced(context.TODO()) }) { + if c.quotaMonitor != nil && !cache.WaitForCacheSync(waitForStopOrTimeout(ctx.Done(), period), func() bool { return c.quotaMonitor.IsSynced(context.TODO()) }) { utilruntime.HandleError(fmt.Errorf("timed out waiting for quota monitor sync")) } + + oldResources = newResources klog.V(2).Infof("synced cluster resource quota controller") }, period, ctx.Done()) } +// printDiff returns a human-readable summary of what resources were added and removed +func printDiff(oldResources, newResources map[schema.GroupVersionResource]struct{}) string { + removed := sets.NewString() + for oldResource := range oldResources { + if _, ok := newResources[oldResource]; !ok { + removed.Insert(fmt.Sprintf("%+v", oldResource)) + } + } + added := sets.NewString() + for newResource := range newResources { + if _, ok := oldResources[newResource]; !ok { + added.Insert(fmt.Sprintf("%+v", newResource)) + } + } + return fmt.Sprintf("added: %v, removed: %v", added.List(), removed.List()) +} + +// waitForStopOrTimeout returns a stop channel that closes when the provided stop channel closes or when the specified timeout is reached +func waitForStopOrTimeout(stopCh <-chan struct{}, timeout time.Duration) <-chan struct{} { + stopChWithTimeout := make(chan struct{}) + go func() { + defer close(stopChWithTimeout) + select { + case <-stopCh: + case <-time.After(timeout): + } + }() + return stopChWithTimeout +} + // resyncMonitors starts or stops quota monitors as needed to ensure that all // (and only) those resources present in the map are monitored. func (c *ClusterQuotaReconcilationController) resyncMonitors(ctx context.Context, resources map[schema.GroupVersionResource]struct{}) error { @@ -290,7 +320,6 @@ func (c *ClusterQuotaReconcilationController) worker() { workFunc := func() bool { uncastKey, uncastData, quit := c.queue.GetWithData() if quit { - klog.V(2).Infof("worker is quited") return true } defer c.queue.Done(uncastKey) @@ -298,11 +327,10 @@ func (c *ClusterQuotaReconcilationController) worker() { c.workerLock.RLock() defer c.workerLock.RUnlock() - klog.V(2).Infof("quota %s is queued", uncastKey) quotaName := uncastKey.(string) quota, err := c.clusterQuotaLister.Get(quotaName) if apierrors.IsNotFound(err) { - klog.V(2).Infof("queued quota %s not found in quota lister", quotaName) + klog.V(4).Infof("queued quota %s not found in quota lister", quotaName) c.queue.Forget(uncastKey) return false } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0f727dfa00..ebdf3fe641 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -754,7 +754,7 @@ github.com/openshift/client-go/user/informers/externalversions/internalinterface github.com/openshift/client-go/user/informers/externalversions/user github.com/openshift/client-go/user/informers/externalversions/user/v1 github.com/openshift/client-go/user/listers/user/v1 -# github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15 +# github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084 ## explicit; go 1.20 github.com/openshift/cluster-policy-controller/pkg/client/genericinformers github.com/openshift/cluster-policy-controller/pkg/cmd/cluster-policy-controller