Fixing renamed & redundant implementation added by the api bump

Author: deepsm007

Dockerfile

@@ -8,7 +8,7 @@ RUN go build -o ../../tmp/_output/bin/move-blobs
 FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
 COPY images/bin/entrypoint.sh /usr/bin/
 COPY manifests/image-references manifests/0* /manifests/
-COPY vendor/github.com/openshift/api/imageregistry/v1/*.crd.yaml /manifests/
+COPY vendor/github.com/openshift/api/imageregistry/v1/**/*.crd.yaml /manifests/
 COPY --from=builder /go/src/github.com/openshift/cluster-image-registry-operator/tmp/_output/bin/cluster-image-registry-operator /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/cluster-image-registry-operator/tmp/_output/bin/move-blobs /usr/bin/
 RUN chmod -R g+w /etc/pki/ca-trust/extracted/pem/

pkg/client/operatorclient.go

@@ -22,6 +22,17 @@ type ConfigOperatorClient struct {
 	lister   imageregistryv1listers.ConfigLister
 }
 
+// GetOperatorStateWithQuorum implements v1helpers.OperatorClient.
+func (c *ConfigOperatorClient) GetOperatorStateWithQuorum(ctx context.Context) (spec *operatorv1.OperatorSpec, status *operatorv1.OperatorStatus, resourceVersion string, err error) {
+	config, err := c.lister.Get("cluster")
+	if err != nil {
+		return nil, nil, "", err
+	}
+	config = config.DeepCopy()
+
+	return &config.Spec.OperatorSpec, &config.Status.OperatorStatus, config.ResourceVersion, nil
+}
+
 var _ v1helpers.OperatorClient = &ConfigOperatorClient{}
 
 func NewConfigOperatorClient(client imageregistryv1client.ConfigInterface, informer imageregistryv1informers.ConfigInformer) *ConfigOperatorClient {

pkg/operator/bootstrap.go

@@ -130,7 +130,7 @@ func (c *Controller) createPVC(accessMode corev1.PersistentVolumeAccessMode, cla
 			AccessModes: []corev1.PersistentVolumeAccessMode{
 				accessMode,
 			},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse("100Gi"),
 				},

pkg/storage/pvc/pvc.go

@@ -170,7 +170,7 @@ func (d *driver) createPVC(cr *imageregistryv1.Config) (*corev1.PersistentVolume
 			AccessModes: []corev1.PersistentVolumeAccessMode{
 				corev1.ReadWriteMany,
 			},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse("100Gi"),
 				},

test/e2e/pvc_test.go

@@ -139,7 +139,7 @@ func createPVC(te framework.TestEnv, name string, accessMode corev1.PersistentVo
 			AccessModes: []corev1.PersistentVolumeAccessMode{
 				accessMode,
 			},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse("1Gi"),
 				},