Merge pull request #174 from legionus/stirage-pvc

Add PVC storage driver

pkg/apis/imageregistry/v1/types.go

@@ -183,12 +183,17 @@ type ImageRegistryConfigStorageFilesystem struct {
 	VolumeSource corev1.VolumeSource `json:"volumeSource,omitempty"`
 }
 
+type ImageRegistryConfigStoragePVC struct {
+	Claim string `json:"claim,omitempty"`
+}
+
 type ImageRegistryConfigStorage struct {
 	Azure      *ImageRegistryConfigStorageAzure      `json:"azure,omitempty"`
 	Filesystem *ImageRegistryConfigStorageFilesystem `json:"filesystem,omitempty"`
 	GCS        *ImageRegistryConfigStorageGCS        `json:"gcs,omitempty"`
 	S3         *ImageRegistryConfigStorageS3         `json:"s3,omitempty"`
 	Swift      *ImageRegistryConfigStorageSwift      `json:"swift,omitempty"`
+	PVC        *ImageRegistryConfigStoragePVC        `json:"pvc,omitempty"`
 }
 
 type ImageRegistryConfigRequests struct {

pkg/resource/caconfig.go

@@ -11,6 +11,7 @@ import (
 	configlisters "github.com/openshift/client-go/config/listers/config/v1"
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorCAConfig{}
@@ -35,7 +36,7 @@ func newGeneratorCAConfig(lister corelisters.ConfigMapNamespaceLister, imageConf
 		imageConfigName:       params.ImageConfig.Name,
 		name:                  params.CAConfig.Name,
 		namespace:             params.Deployment.Namespace,
-		owner:                 asOwner(cr),
+		owner:                 util.AsOwner(cr),
 	}
 }
 
@@ -81,7 +82,7 @@ func (gcac *generatorCAConfig) expected() (runtime.Object, error) {
 		}
 	}
 
-	addOwnerRefToObject(cm, gcac.owner)
+	util.AddOwnerRefToObject(cm, gcac.owner)
 
 	return cm, nil
 }

pkg/resource/clusterrole.go

@@ -8,6 +8,7 @@ import (
 	rbaclisters "k8s.io/client-go/listers/rbac/v1"
 
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorClusterRole{}
@@ -22,7 +23,7 @@ func newGeneratorClusterRole(lister rbaclisters.ClusterRoleLister, client rbacse
 	return &generatorClusterRole{
 		lister: lister,
 		client: client,
-		owner:  asOwner(cr),
+		owner:  util.AsOwner(cr),
 	}
 }
 
@@ -93,7 +94,7 @@ func (gcr *generatorClusterRole) expected() (runtime.Object, error) {
 		},
 	}
 
-	addOwnerRefToObject(role, gcr.owner)
+	util.AddOwnerRefToObject(role, gcr.owner)
 
 	return role, nil
 }

pkg/resource/clusterrolebinding.go

@@ -9,6 +9,7 @@ import (
 
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorClusterRoleBinding{}
@@ -27,7 +28,7 @@ func newGeneratorClusterRoleBinding(lister rbaclisters.ClusterRoleBindingLister,
 		client:      client,
 		saName:      params.Pod.ServiceAccount,
 		saNamespace: params.Deployment.Namespace,
-		owner:       asOwner(cr),
+		owner:       util.AsOwner(cr),
 	}
 }
 
@@ -65,7 +66,7 @@ func (gcrb *generatorClusterRoleBinding) expected() (runtime.Object, error) {
 		},
 	}
 
-	addOwnerRefToObject(crb, gcrb.owner)
+	util.AddOwnerRefToObject(crb, gcrb.owner)
 
 	return crb, nil
 }

pkg/resource/deployment.go

@@ -12,6 +12,7 @@ import (
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
 	"github.com/openshift/cluster-image-registry-operator/pkg/storage"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorDeployment{}
@@ -83,7 +84,7 @@ func (gd *generatorDeployment) expected() (runtime.Object, error) {
 		},
 	}
 
-	addOwnerRefToObject(deploy, asOwner(gd.cr))
+	util.AddOwnerRefToObject(deploy, util.AsOwner(gd.cr))
 
 	return deploy, nil
 }

pkg/resource/generator.go

@@ -171,6 +171,11 @@ func (g *Generator) removeObsoleteRoutes(cr *imageregistryv1.Config) error {
 }
 
 func (g *Generator) Apply(cr *imageregistryv1.Config) error {
+	err := g.syncStorage(cr)
+	if err != nil {
+		return fmt.Errorf("unable to sync storage configuration: %s", err)
+	}
+
 	generators, err := g.list(cr)
 	if err != nil {
 		return fmt.Errorf("unable to get generators: %s", err)
@@ -214,11 +219,6 @@ func (g *Generator) Apply(cr *imageregistryv1.Config) error {
 		return fmt.Errorf("unable to remove obsolete routes: %s", err)
 	}
 
-	err = g.syncStorage(cr)
-	if err != nil {
-		return fmt.Errorf("unable to sync storage configuration: %s", err)
-	}
-
 	return nil
 }
 

pkg/resource/imageconfig.go

@@ -19,6 +19,7 @@ import (
 
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorImageConfig{}
@@ -43,7 +44,7 @@ func newGeneratorImageConfig(configLister configlisters.ImageLister, routeLister
 		name:          params.ImageConfig.Name,
 		namespace:     params.Deployment.Namespace,
 		serviceName:   params.Service.Name,
-		owner:         asOwner(cr),
+		owner:         util.AsOwner(cr),
 	}
 }
 

pkg/resource/route.go

@@ -11,6 +11,7 @@ import (
 
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorRoute{}
@@ -32,7 +33,7 @@ func newGeneratorRoute(lister routelisters.RouteNamespaceLister, secretLister co
 		client:       client,
 		namespace:    params.Deployment.Namespace,
 		serviceName:  params.Service.Name,
-		owner:        asOwner(cr),
+		owner:        util.AsOwner(cr),
 		route:        route,
 	}
 }
@@ -83,7 +84,7 @@ func (gr *generatorRoute) expected() (runtime.Object, error) {
 		}
 	}
 
-	addOwnerRefToObject(r, gr.owner)
+	util.AddOwnerRefToObject(r, gr.owner)
 
 	return r, nil
 }

pkg/resource/secret.go

@@ -10,6 +10,7 @@ import (
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
 	"github.com/openshift/cluster-image-registry-operator/pkg/storage"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorSecret{}
@@ -30,7 +31,7 @@ func newGeneratorSecret(lister corelisters.SecretNamespaceLister, client coreset
 		driver:    driver,
 		name:      imageregistryv1.ImageRegistryPrivateConfiguration,
 		namespace: params.Deployment.Namespace,
-		owner:     asOwner(cr),
+		owner:     util.AsOwner(cr),
 	}
 }
 
@@ -61,7 +62,7 @@ func (gs *generatorSecret) expected() (runtime.Object, error) {
 
 	sec.StringData = data
 
-	addOwnerRefToObject(sec, gs.owner)
+	util.AddOwnerRefToObject(sec, gs.owner)
 
 	return sec, nil
 }

pkg/resource/service.go

@@ -13,6 +13,7 @@ import (
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
 	"github.com/openshift/cluster-image-registry-operator/pkg/resource/strategy"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorService{}
@@ -37,7 +38,7 @@ func newGeneratorService(lister corelisters.ServiceNamespaceLister, client cores
 		labels:     params.Deployment.Labels,
 		port:       params.Container.Port,
 		secretName: imageregistryv1.ImageRegistryName + "-tls",
-		owner:      asOwner(cr),
+		owner:      util.AsOwner(cr),
 	}
 }
 
@@ -77,7 +78,7 @@ func (gs *generatorService) expected() *corev1.Service {
 		"service.alpha.openshift.io/serving-cert-secret-name": gs.secretName,
 	}
 
-	addOwnerRefToObject(svc, gs.owner)
+	util.AddOwnerRefToObject(svc, gs.owner)
 
 	return svc
 }

pkg/resource/serviceaccount.go

@@ -9,6 +9,7 @@ import (
 
 	imageregistryv1 "github.com/openshift/cluster-image-registry-operator/pkg/apis/imageregistry/v1"
 	"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
+	"github.com/openshift/cluster-image-registry-operator/pkg/util"
 )
 
 var _ Mutator = &generatorServiceAccount{}
@@ -27,7 +28,7 @@ func newGeneratorServiceAccount(lister corelisters.ServiceAccountNamespaceLister
 		client:    client,
 		name:      params.Pod.ServiceAccount,
 		namespace: params.Deployment.Namespace,
-		owner:     asOwner(cr),
+		owner:     util.AsOwner(cr),
 	}
 }
 
@@ -51,7 +52,7 @@ func (gsa *generatorServiceAccount) expected() (runtime.Object, error) {
 		},
 	}
 
-	addOwnerRefToObject(sa, gsa.owner)
+	util.AddOwnerRefToObject(sa, gsa.owner)
 
 	return sa, nil
 }