Merge pull request #334 from alecmerdler/fix-objectstorage

Add RBAC Permission for Jobs
quay · Oct 21, 2020 · 080558d · 080558d
2 parents edba5e8 + b39211c
commit 080558d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/deploy/manifests/quay-operator/0.0.1/quay-operator.clusterserviceversion.yaml b/deploy/manifests/quay-operator/0.0.1/quay-operator.clusterserviceversion.yaml
@@ -47,6 +47,7 @@ spec:
         - kind: ReplicaSet
         - kind: Pod
         - kind: Secret
+        - Kind: Job
         - kind: ConfigMap
         - kind: PersistentVolumeClaim
         - kind: Ingress
@@ -190,6 +191,12 @@ spec:
           - objectbucketclaims
           verbs:
           - '*'
+        - apiGroups:
+          - batch
+          resources:
+          - jobs
+          verbs:
+          - '*'
         serviceAccountName: quay-operator
     strategy: deployment
   installModes:

diff --git a/pkg/kustomize/secrets.go b/pkg/kustomize/secrets.go
@@ -167,12 +167,13 @@ func FieldGroupFor(component string, quay *v1.QuayRegistry) (shared.FieldGroup,
 				"local_us": {
 					Name: "RadosGWStorage",
 					Args: &shared.DistributedStorageArgs{
-						Hostname:   hostname,
-						IsSecure:   true,
-						Port:       443,
-						BucketName: bucketName,
-						AccessKey:  accessKey,
-						SecretKey:  secretKey,
+						Hostname:    hostname,
+						IsSecure:    true,
+						Port:        443,
+						BucketName:  bucketName,
+						AccessKey:   accessKey,
+						SecretKey:   secretKey,
+						StoragePath: "/datastorage/registry",
 					},
 				},
 			},

diff --git a/pkg/kustomize/secrets_test.go b/pkg/kustomize/secrets_test.go
@@ -97,12 +97,13 @@ var fieldGroupForTests = []struct {
 				"local_us": {
 					Name: "RadosGWStorage",
 					Args: &shared.DistributedStorageArgs{
-						AccessKey:  "abc123",
-						BucketName: "quay-datastore",
-						Hostname:   "s3.noobaa.svc",
-						IsSecure:   true,
-						Port:       443,
-						SecretKey:  "super-secret",
+						AccessKey:   "abc123",
+						BucketName:  "quay-datastore",
+						Hostname:    "s3.noobaa.svc",
+						IsSecure:    true,
+						Port:        443,
+						SecretKey:   "super-secret",
+						StoragePath: "/datastorage/registry",
 					},
 				},
 			},