Skip to content

Commit

Permalink
Changing the latest noobaa images.
Browse files Browse the repository at this point in the history
Changed the versions of 'LATEST_NOOBAA_IMAGE' and
'LATEST_NOOBAA_CORE_IMAGE' images in 'common.sh' and
ran 'make gen-latest-csv' command to fetch other changes.

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>
  • Loading branch information
aruniiird committed Dec 16, 2020
1 parent b15999a commit 84805b6
Show file tree
Hide file tree
Showing 7 changed files with 888 additions and 23 deletions.
298 changes: 294 additions & 4 deletions deploy/csv-templates/crds/noobaa-crd.yaml

Large diffs are not rendered by default.

158 changes: 152 additions & 6 deletions deploy/csv-templates/noobaa-csv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
annotations:
alm-examples: '[{"kind":"NooBaa","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"noobaa","creationTimestamp":null},"spec":{"cleanupPolicy":{}},"status":{}},{"kind":"BackingStore","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"default","creationTimestamp":null},"spec":{"type":""},"status":{"mode":{}}},{"kind":"BucketClass","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"default","creationTimestamp":null},"spec":{"placementPolicy":{"tiers":[{"backingStores":["aws1"]}]}},"status":{}}]'
alm-examples: '[{"kind":"NooBaa","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"noobaa","creationTimestamp":null},"spec":{"cleanupPolicy":{},"security":{"kms":{}}},"status":{}},{"kind":"BackingStore","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"default","creationTimestamp":null},"spec":{"type":""},"status":{"mode":{}}},{"kind":"NamespaceStore","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"default","creationTimestamp":null},"spec":{"type":""},"status":{"mode":{}}},{"kind":"BucketClass","apiVersion":"noobaa.io/v1alpha1","metadata":{"name":"default","creationTimestamp":null},"spec":{},"status":{}}]'
capabilities: Basic Install
categories: Storage,Big Data
certified: "false"
containerImage: noobaa/noobaa-operator:5.6.0
containerImage: noobaa/noobaa-operator:5.7.0
createdAt: "2019-07-08T13:10:20.940Z"
description: NooBaa is an object data service for hybrid and multi cloud environments.
repository: https://github.com/noobaa/noobaa-operator
support: Red Hat
creationTimestamp: null
name: noobaa-operator.v5.6.0
name: noobaa-operator.v5.7.0
namespace: noobaa
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -214,7 +214,112 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:ibmCos
- urn:alm:descriptor:com.tectonic.ui:text
version: v1alpha1
- description: Storage policy spec tiering, mirroring, spreading. Combines BackingStores. Referenced by ObjectBucketClaims.
- description: Storage target spec such as aws-s3, s3-compatible, ibm-cos and more. Used in BucketClass to construct namespace policies.
displayName: Namespace Store
kind: NamespaceStore
name: namespacestores.noobaa.io
resources:
- kind: Service
name: services
version: v1
- kind: Secret
name: secrets
version: v1
- kind: ConfigMap
name: configmaps
version: v1
- kind: StatefulSet
name: statefulsets.apps
version: v1
specDescriptors:
- description: Region is the AWS region.
displayName: Region
path: awsS3.region
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:awsS3
- urn:alm:descriptor:com.tectonic.ui:text
- description: Secret refers to a secret that provides the credentials. The secret should define AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.
displayName: Secret
path: awsS3.secret.name
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:awsS3
- urn:alm:descriptor:io.kubernetes:Secret
- description: SSLDisabled allows to disable SSL and use plain http.
displayName: SSL Disabled
path: awsS3.sslDisabled
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:awsS3
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch
- description: TargetBucket is the name of the target S3 bucket.
displayName: Target Bucket
path: awsS3.targetBucket
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:awsS3
- urn:alm:descriptor:com.tectonic.ui:text
- description: |2-
Secret refers to a secret that provides the credentials. The secret should define AccountName and AccountKey as provided
by Azure Blob.
displayName: Secret
path: azureBlob.secret.name
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:azureBlob
- urn:alm:descriptor:io.kubernetes:Secret
- description: TargetBlobContainer is the name of the target Azure Blob container.
displayName: Target Blob Container
path: azureBlob.targetBlobContainer
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:azureBlob
- urn:alm:descriptor:com.tectonic.ui:text
- description: 'Endpoint is the S3 compatible endpoint: http(s)://host:port.'
displayName: End Point
path: s3Compatible.endpoint
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:s3Compatible
- urn:alm:descriptor:com.tectonic.ui:text
- description: Secret refers to a secret that provides the credentials. The secret should define AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.
displayName: Secret
path: s3Compatible.secret.name
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:s3Compatible
- urn:alm:descriptor:io.kubernetes:Secret
- description: SignatureVersion specifies the client signature version to use when signing requests.
displayName: Signature Version
path: s3Compatible.signatureVersion
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:s3Compatible
- urn:alm:descriptor:com.tectonic.ui:number
- description: TargetBucket is the name of the target S3 bucket.
displayName: Target Bucket
path: s3Compatible.targetBucket
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:s3Compatible
- urn:alm:descriptor:com.tectonic.ui:text
- description: 'Endpoint is the IBM COS endpoint: http(s)://host:port.'
displayName: End Point
path: IBMCos.endpoint
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:ibmCos
- urn:alm:descriptor:com.tectonic.ui:text
- description: Secret refers to a secret that provides the credentials. The secret should define IBM_COS_ACCESS_KEY_ID and IBM_COS_SECRET_ACCESS_KEY.
displayName: Secret
path: IBMCos.secret.name
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:ibmCos
- urn:alm:descriptor:io.kubernetes:Secret
- description: SignatureVersion specifies the client signature version to use when signing requests.
displayName: Signature Version
path: IBMCos.signatureVersion
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:ibmCos
- urn:alm:descriptor:com.tectonic.ui:number
- description: TargetBucket is the name of the target IBM COS bucket.
displayName: Target Bucket
path: IBMCos.targetBucket
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:ibmCos
- urn:alm:descriptor:com.tectonic.ui:text
version: v1alpha1
- description: Storage policy spec tiering, mirroring, spreading, namespace policy. Combines BackingStores Or NamespaceStores. Referenced by ObjectBucketClaims.
displayName: Bucket Class
kind: BucketClass
name: bucketclasses.noobaa.io
Expand Down Expand Up @@ -244,6 +349,36 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:placementPolicy
- urn:alm:descriptor:com.tectonic.ui:text
- description: Namespace Policy type specifies the type of the namespace policy configuration.
displayName: Namespace Policy
path: namespacePolicy.type
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:namespacePolicy
- urn:alm:descriptor:com.tectonic.ui:text
- description: Resource specifies the namespace store configured by the bucket class to be read and write targets.
displayName: Resource
path: namespacePolicy.single.resource
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:namespacePolicy
- urn:alm:descriptor:com.tectonic.ui:text
- description: Read Resources specifies the namespace stores configured by the bucket class to be read targets.
displayName: Read Resources
path: namespacePolicy.Multi.readResources
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:namespacePolicy
- urn:alm:descriptor:com.tectonic.ui:text
- description: Write Resource specifies the namespace store configured by the bucket class to be write target.
displayName: Write Resource
path: namespacePolicy.Multi.writeResource
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:namespacePolicy
- urn:alm:descriptor:com.tectonic.ui:text
- description: Hub Resource specifies the target namespace store configured by the bucket class to be read and write targets.
displayName: Hub Resource
path: namespacePolicy.Cache.hubResource
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:namespacePolicy
- urn:alm:descriptor:com.tectonic.ui:text
version: v1alpha1
required:
- description: Claim a bucket just like claiming a PV. Automate you app bucket provisioning by creating OBC with your app deployment. A secret and configmap (name=claim) will be created with access details for the app pods.
Expand Down Expand Up @@ -381,7 +516,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: noobaa/noobaa-operator:5.6.0
image: noobaa/noobaa-operator:5.7.0
name: noobaa-operator
resources:
limits:
Expand Down Expand Up @@ -498,6 +633,17 @@ spec:
- patch
- list
- watch
- apiGroups:
- batch
resources:
- jobs
verbs:
- get
- create
- update
- patch
- list
- watch
serviceAccountName: noobaa
strategy: deployment
installModes:
Expand Down Expand Up @@ -541,5 +687,5 @@ spec:
minKubeVersion: 1.16.0
provider:
name: NooBaa
version: 5.6.0
version: 5.7.0
status: {}
51 changes: 47 additions & 4 deletions deploy/olm-catalog/ocs-operator/manifests/bucketclass.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ spec:
jsonPath: .spec.placementPolicy
name: Placement
type: string
- description: NamespacePolicy
jsonPath: .spec.namespacePolicy
name: NamespacePolicy
type: string
- description: Phase
jsonPath: .status.phase
name: Phase
Expand All @@ -40,6 +44,49 @@ spec:
spec:
description: Specification of the desired behavior of the noobaa BucketClass.
properties:
namespacePolicy:
description: NamespacePolicy specifies the namespace policy for the bucket class
properties:
cache:
description: Cache is a namespace policy configuration of type Cache
properties:
caching:
description: Caching is the cache specification for the ns policy
properties:
prefix:
description: Prefix is prefix of the future cached data
type: string
ttl:
description: TTL specifies the cache ttl
type: integer
type: object
hubResource:
description: HubResource is the read and write resource name to use
type: string
type: object
multi:
description: Multi is a namespace policy configuration of type Multi
properties:
readResources:
description: ReadResources is an ordered list of read resources names to use
items:
type: string
type: array
writeResource:
description: WriteResource is the write resource name to use
type: string
type: object
single:
description: Single is a namespace policy configuration of type Single
properties:
resource:
description: Resource is the read and write resource name to use
type: string
type: object
type:
description: Type is the namespace policy type
type: string
type: object
placementPolicy:
description: PlacementPolicy specifies the placement policy for the bucket class
properties:
Expand All @@ -61,11 +108,7 @@ spec:
type: string
type: object
type: array
required:
- tiers
type: object
required:
- placementPolicy
type: object
status:
description: Most recently observed status of the noobaa BackingStore.
Expand Down
Loading

0 comments on commit 84805b6

Please sign in to comment.