Merge branch 'openshift:master' into remove-bind-address-ibm-deployment

Author: jared-hayes-dev

Makefile

@@ -3,7 +3,7 @@
 IMG ?= controller:latest
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.30.1
+ENVTEST_K8S_VERSION = 1.30.3
 
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -34,7 +34,7 @@ verify: fmt vet lint
 test: generate verify manifests unit
 
 unit:
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --use-deprecated-gcs=true -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --index https://raw.githubusercontent.com/openshift/api/master/envtest-releases.yaml)" ./hack/ci-test.sh
 
 # Build operator binaries
 build: operator config-sync-controllers azure-config-credentials-injector

README.md

@@ -22,7 +22,7 @@ This operator is considered stable with unit and end-to-end testing against the
 | [OpenStack](https://github.com/openshift/cloud-provider-openstack)   | Yes                  | Yes           |
 | [vSphere](https://github.com/openshift/cloud-provider-vsphere)       | Yes                  | Yes           |
 | [IBM](https://github.com/openshift/cloud-provider-ibm)               | Yes                  |               |
-| [Alibaba](https://github.com/openshift/cloud-provider-alibaba-cloud) | Yes                  | Yes           |
+| [Alibaba](https://github.com/openshift/cloud-provider-alibaba-cloud) | Removed              | No            |
 | [Power VS](https://github.com/openshift/cloud-provider-powervs)      | Yes                  |               |
 | [Nutanix](https://github.com/openshift/cloud-provider-nutanix)       | Yes                  | Yes           |
 

cmd/cluster-cloud-controller-manager-operator/main.go

@@ -35,7 +35,6 @@ import (
 	"k8s.io/component-base/config"
 	"k8s.io/component-base/config/options"
 	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/textlogger"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
@@ -77,8 +76,7 @@ func init() {
 }
 
 func main() {
-	textLoggerCfg := textlogger.NewConfig()
-	textLoggerCfg.AddFlags(flag.CommandLine)
+	klog.InitFlags(flag.CommandLine)
 
 	metricsAddr := flag.String(
 		"metrics-bind-address",
@@ -109,7 +107,7 @@ func main() {
 	options.BindLeaderElectionFlags(&leaderElectionConfig, pflag.CommandLine)
 	pflag.Parse()
 
-	ctrl.SetLogger(textlogger.NewLogger(textLoggerCfg).WithName("CCMOperator"))
+	ctrl.SetLogger(klog.NewKlogr().WithName("CCMOperator"))
 
 	restConfig := ctrl.GetConfigOrDie()
 	le := util.GetLeaderElectionDefaults(restConfig, configv1.LeaderElection{

manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml

@@ -11,7 +11,6 @@ data:
   images.json: >
     {
       "cloudControllerManagerOperator": "quay.io/openshift/origin-cluster-cloud-controller-manager-operator",
-      "cloudControllerManagerAlibaba": "quay.io/openshift/origin-alibaba-cloud-controller-manager",
       "cloudControllerManagerAWS": "quay.io/openshift/origin-aws-cloud-controller-manager",
       "cloudControllerManagerAzure": "quay.io/openshift/origin-azure-cloud-controller-manager",
       "cloudNodeManagerAzure": "quay.io/openshift/origin-azure-cloud-node-manager",

manifests/0000_26_cloud-controller-manager-operator_02_rbac_operator.yaml

@@ -75,6 +75,19 @@ rules:
   - update
   - patch
 
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - validatingadmissionpolicies
+  - validatingadmissionpolicybindings
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+
 # vSphere has a separate node manager that uses the service account kube-system/vsphere-cloud-controller-manager.
 # The operator must have these permissions to then grant them to the vSphere node manager.
 - apiGroups:
@@ -106,7 +119,6 @@ rules:
   - create
   - patch
 
-# alibaba has a separate node manager that uses the service account kube-system/alibaba-cloud-controller-manager.
 # The operator must have these permissions to then grant them to the alibaba node manager. (note it also uses some of the ones requred by vsphere)
 - apiGroups:
   - ""
@@ -127,7 +139,7 @@ rules:
   - patch
 
 # nutanix has a separate node manager that uses the service account kube-system/nutanix-cloud-controller-manager.
-# The operator must have these permissions to then grant them to the nutanix node manager. (note it also uses some of the ones requred by vsphere and alibaba)
+# The operator must have these permissions to then grant them to the nutanix node manager. (note it also uses some of the ones requred by vsphere)
 - apiGroups:
   - ""
   resources:

manifests/image-references

@@ -6,10 +6,6 @@ spec:
     from:
       kind: DockerImage
       name: quay.io/openshift/origin-cluster-cloud-controller-manager-operator
-  - name: alibaba-cloud-controller-manager
-    from:
-      kind: DockerImage
-      name: quay.io/openshift/origin-alibaba-cloud-controller-manager
   - name: aws-cloud-controller-manager
     from:
       kind: DockerImage