Merge remote-tracking branch 'upstream/7.4'
# Conflicts:
# .github/ISSUE_TEMPLATE/bug_report.yml
# CHANGELOG.md
# bom-generator-plugin/pom.xml
# chaos-tests/pom.xml
# crd-generator/api-v2/pom.xml
# crd-generator/api/pom.xml
# crd-generator/apt/pom.xml
# crd-generator/cli/pom.xml
# crd-generator/collector/pom.xml
# crd-generator/maven-plugin/pom.xml
# crd-generator/pom.xml
# crd-generator/test-apt/pom.xml
# crd-generator/test/pom.xml
# extensions/certmanager/client/pom.xml
# extensions/certmanager/examples/pom.xml
# extensions/certmanager/model/pom.xml
# extensions/certmanager/pom.xml
# extensions/certmanager/tests/pom.xml
# extensions/chaosmesh/client/pom.xml
# extensions/chaosmesh/examples/pom.xml
# extensions/chaosmesh/model/pom.xml
# extensions/chaosmesh/pom.xml
# extensions/chaosmesh/tests/pom.xml
# extensions/istio/client/pom.xml
# extensions/istio/examples/pom.xml
# extensions/istio/model/pom.xml
# extensions/istio/pom.xml
# extensions/istio/tests/pom.xml
# extensions/knative/client/pom.xml
# extensions/knative/examples/pom.xml
# extensions/knative/model/pom.xml
# extensions/knative/pom.xml
# extensions/knative/tests/pom.xml
# extensions/open-cluster-management/client/pom.xml
# extensions/open-cluster-management/examples/pom.xml
# extensions/open-cluster-management/model/pom.xml
# extensions/open-cluster-management/pom.xml
# extensions/open-cluster-management/tests/pom.xml
# extensions/open-virtual-network/client/pom.xml
# extensions/open-virtual-network/model/pom.xml
# extensions/open-virtual-network/pom.xml
# extensions/open-virtual-network/tests/pom.xml
# extensions/pom.xml
# extensions/tekton/client/pom.xml
# extensions/tekton/examples/pom.xml
# extensions/tekton/model/pom.xml
# extensions/tekton/pom.xml
# extensions/tekton/tests/pom.xml
# extensions/verticalpodautoscaler/client/pom.xml
# extensions/verticalpodautoscaler/examples/pom.xml
# extensions/verticalpodautoscaler/model/pom.xml
# extensions/verticalpodautoscaler/pom.xml
# extensions/verticalpodautoscaler/tests/pom.xml
# extensions/volcano/client/pom.xml
# extensions/volcano/examples/pom.xml
# extensions/volcano/model/pom.xml
# extensions/volcano/pom.xml
# extensions/volcano/tests/pom.xml
# extensions/volumesnapshot/client/pom.xml
# extensions/volumesnapshot/examples/pom.xml
# extensions/volumesnapshot/model/pom.xml
# extensions/volumesnapshot/pom.xml
# extensions/volumesnapshot/tests/pom.xml
# generator-annotations/pom.xml
# httpclient-jdk/pom.xml
# httpclient-jetty/pom.xml
# httpclient-okhttp/pom.xml
# httpclient-vertx/pom.xml
# java-generator/benchmark/pom.xml
# java-generator/cli/pom.xml
# java-generator/core/pom.xml
# java-generator/gradle-plugin/pom.xml
# java-generator/it/pom.xml
# java-generator/maven-plugin/pom.xml
# java-generator/pom.xml
# junit/kube-api-test/client-inject/pom.xml
# junit/kube-api-test/core/pom.xml
# junit/kube-api-test/pom.xml
# junit/kubernetes-junit-jupiter-autodetected/pom.xml
# junit/kubernetes-junit-jupiter/pom.xml
# junit/kubernetes-server-mock/pom.xml
# junit/mockwebserver/pom.xml
# kubernetes-client-api/pom.xml
# kubernetes-client-deps-compatibility-tests/kubernetes-client-init-bc-fips/pom.xml
# kubernetes-client-deps-compatibility-tests/pom.xml
# kubernetes-client/pom.xml
# kubernetes-examples/pom.xml
# kubernetes-itests/pom.xml
# kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml
# kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml
# kubernetes-model-generator/kubernetes-model-apps/pom.xml
# kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml
# kubernetes-model-generator/kubernetes-model-batch/pom.xml
# kubernetes-model-generator/kubernetes-model-certificates/pom.xml
# kubernetes-model-generator/kubernetes-model-common/pom.xml
# kubernetes-model-generator/kubernetes-model-coordination/pom.xml
# kubernetes-model-generator/kubernetes-model-core/pom.xml
# kubernetes-model-generator/kubernetes-model-discovery/pom.xml
# kubernetes-model-generator/kubernetes-model-events/pom.xml
# kubernetes-model-generator/kubernetes-model-extensions/pom.xml
# kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml
# kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml
# kubernetes-model-generator/kubernetes-model-kustomize/pom.xml
# kubernetes-model-generator/kubernetes-model-metrics/pom.xml
# kubernetes-model-generator/kubernetes-model-networking/pom.xml
# kubernetes-model-generator/kubernetes-model-node/pom.xml
# kubernetes-model-generator/kubernetes-model-policy/pom.xml
# kubernetes-model-generator/kubernetes-model-rbac/pom.xml
# kubernetes-model-generator/kubernetes-model-resource/pom.xml
# kubernetes-model-generator/kubernetes-model-scheduling/pom.xml
# kubernetes-model-generator/kubernetes-model-storageclass/pom.xml
# kubernetes-model-generator/openapi/maven-plugin/pom.xml
# kubernetes-model-generator/openapi/validator/pom.xml
# kubernetes-model-generator/openshift-model-autoscaling/pom.xml
# kubernetes-model-generator/openshift-model-config/pom.xml
# kubernetes-model-generator/openshift-model-console/pom.xml
# kubernetes-model-generator/openshift-model-hive/pom.xml
# kubernetes-model-generator/openshift-model-installer/pom.xml
# kubernetes-model-generator/openshift-model-machine/pom.xml
# kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml
# kubernetes-model-generator/openshift-model-miscellaneous/pom.xml
# kubernetes-model-generator/openshift-model-monitoring/pom.xml
# kubernetes-model-generator/openshift-model-operator/pom.xml
# kubernetes-model-generator/openshift-model-operatorhub/pom.xml
# kubernetes-model-generator/openshift-model-storageversionmigrator/pom.xml
# kubernetes-model-generator/openshift-model-tuned/pom.xml
# kubernetes-model-generator/openshift-model-whereabouts/pom.xml
# kubernetes-model-generator/openshift-model/pom.xml
# kubernetes-model-generator/pom.xml
# kubernetes-tests/pom.xml
# log4j/pom.xml
# openshift-client-api/pom.xml
# openshift-client/pom.xml
# platforms/karaf/features/pom.xml
# platforms/karaf/itests/pom.xml
# platforms/karaf/pom.xml
# platforms/pom.xml
# pom.xml
# uberjar/pom.xml
# zjsonpatch/pom.xml
