diff --git a/bundle/manifests/atlas.mongodb.com_atlasbackuppolicies.yaml b/bundle/manifests/atlas.mongodb.com_atlasbackuppolicies.yaml index 81626e1320..43ce245592 100644 --- a/bundle/manifests/atlas.mongodb.com_atlasbackuppolicies.yaml +++ b/bundle/manifests/atlas.mongodb.com_atlasbackuppolicies.yaml @@ -51,10 +51,33 @@ spec: enum: - 1 - 2 + - 3 - 4 + - 5 - 6 + - 7 - 8 + - 9 + - 10 + - 11 - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 40 type: integer frequencyType: description: 'Frequency associated with the backup policy item. diff --git a/bundle/manifests/atlas.mongodb.com_atlasdeployments.yaml b/bundle/manifests/atlas.mongodb.com_atlasdeployments.yaml index e1411eac72..fda3d70a21 100644 --- a/bundle/manifests/atlas.mongodb.com_atlasdeployments.yaml +++ b/bundle/manifests/atlas.mongodb.com_atlasdeployments.yaml @@ -37,9 +37,12 @@ spec: type: object spec: description: AtlasDeploymentSpec defines the desired state of AtlasDeployment + Only one of DeploymentSpec, AdvancedDeploymentSpec and ServerlessSpec + should be defined properties: advancedDeploymentSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/clusters-advanced/ + description: Configuration for the advanced (v1.5) deployment API + https://www.mongodb.com/docs/atlas/reference/api/clusters-advanced/ properties: backupEnabled: type: boolean @@ -60,67 +63,10 @@ spec: type: object clusterType: type: string - connectionStrings: - description: ConnectionStrings configuration for applications - use to connect to this deployment. - properties: - awsPrivateLink: - additionalProperties: - type: string - type: object - awsPrivateLinkSrv: - additionalProperties: - type: string - type: object - private: - type: string - privateEndpoint: - items: - description: PrivateEndpointSpec connection strings. Each - object describes the connection strings you can use to - connect to this deployment through a private endpoint. - Atlas returns this parameter only if you deployed a private - endpoint to all regions to which you deployed this deployment's - nodes. - properties: - connectionString: - type: string - endpoints: - items: - description: EndpointSpec through which you connect - to Atlas. - properties: - endpointId: - type: string - providerName: - type: string - region: - type: string - type: object - type: array - srvConnectionString: - type: string - type: - type: string - type: object - type: array - privateSrv: - type: string - standard: - type: string - standardSrv: - type: string - type: object - createDate: - type: string diskSizeGB: type: integer encryptionAtRestProvider: type: string - groupId: - type: string - id: - type: string labels: items: description: LabelSpec contains key-value pairs that tag and @@ -141,6 +87,10 @@ spec: mongoDBVersion: type: string name: + description: Name of the advanced deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string paused: type: boolean @@ -149,8 +99,6 @@ spec: replicationSpecs: items: properties: - id: - type: string numShards: type: integer regionConfigs: @@ -169,14 +117,9 @@ spec: type: integer type: object autoScaling: - description: AutoScalingSpec configures your deployment - to automatically scale its storage + description: AdvancedAutoScalingSpec configures your + deployment to automatically scale its storage properties: - autoIndexingEnabled: - description: Flag that indicates whether autopilot - mode for Performance Advisor is enabled. The - default is false. - type: boolean compute: description: Collection of settings that configure how a deployment might scale its deployment @@ -207,10 +150,13 @@ spec: : true.' type: boolean type: object - diskGBEnabled: + diskGB: description: Flag that indicates whether disk auto-scaling is enabled. The default is true. - type: boolean + properties: + enabled: + type: boolean + type: object type: object backingProviderName: type: string @@ -252,8 +198,6 @@ spec: type: array rootCertType: type: string - stateName: - type: string versionReleaseSystem: type: string type: object @@ -270,7 +214,7 @@ spec: - name type: object deploymentSpec: - description: Configuration for the advanced deployment API + description: Configuration for the normal (v1) deployment API https://www.mongodb.com/docs/atlas/reference/api/clusters/ properties: autoScaling: description: Collection of settings that configures auto-scaling @@ -378,7 +322,9 @@ spec: type: string name: description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + Atlas creates the deployment, you can't change its name. Can + only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string numShards: description: Positive integer that specifies the number of shards @@ -600,11 +546,13 @@ spec: - name type: object serverlessSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/clusters-advanced/ + description: Configuration for the serverless deployment API. https://www.mongodb.com/docs/atlas/reference/api/serverless-instances/ properties: name: - description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + description: Name of the serverless deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string providerSettings: description: Configuration for the provisioned hosts on which diff --git a/bundle/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml b/bundle/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml index f596f841eb..4297d95692 100644 --- a/bundle/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml +++ b/bundle/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml @@ -111,8 +111,8 @@ metadata: description: The MongoDB Atlas Kubernetes Operator enables easy management of Clusters in MongoDB Atlas operators.operatorframework.io/builder: operator-sdk-v1.15.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 - containerImage: mongodb/mongodb-atlas-kubernetes-operator:1.1.0 - name: mongodb-atlas-kubernetes.v1.1.0 + containerImage: mongodb/mongodb-atlas-kubernetes-operator:1.2.0 + name: mongodb-atlas-kubernetes.v1.2.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -420,7 +420,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: mongodb/mongodb-atlas-kubernetes-operator:1.1.0 + image: mongodb/mongodb-atlas-kubernetes-operator:1.2.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -495,5 +495,5 @@ spec: maturity: beta provider: name: MongoDB, Inc - version: 1.1.0 - replaces: mongodb-atlas-kubernetes.v1.0.0 + version: 1.2.0 + replaces: mongodb-atlas-kubernetes.v1.1.0 diff --git a/deploy/all-in-one.yaml b/deploy/all-in-one.yaml index bae90096b1..1bcdc812c9 100644 --- a/deploy/all-in-one.yaml +++ b/deploy/all-in-one.yaml @@ -60,10 +60,33 @@ spec: enum: - 1 - 2 + - 3 - 4 + - 5 - 6 + - 7 - 8 + - 9 + - 10 + - 11 - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 40 type: integer frequencyType: description: 'Frequency associated with the backup policy item. @@ -500,9 +523,12 @@ spec: type: object spec: description: AtlasDeploymentSpec defines the desired state of AtlasDeployment + Only one of DeploymentSpec, AdvancedDeploymentSpec and ServerlessSpec + should be defined properties: advancedDeploymentSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the advanced (v1.5) deployment API + https://www.mongodb.com/docs/atlas/reference/api/clusters-advanced/ properties: backupEnabled: type: boolean @@ -523,67 +549,10 @@ spec: type: object clusterType: type: string - connectionStrings: - description: ConnectionStrings configuration for applications - use to connect to this deployment. - properties: - awsPrivateLink: - additionalProperties: - type: string - type: object - awsPrivateLinkSrv: - additionalProperties: - type: string - type: object - private: - type: string - privateEndpoint: - items: - description: PrivateEndpointSpec connection strings. Each - object describes the connection strings you can use to - connect to this deployment through a private endpoint. - Atlas returns this parameter only if you deployed a private - endpoint to all regions to which you deployed this deployment's - nodes. - properties: - connectionString: - type: string - endpoints: - items: - description: EndpointSpec through which you connect - to Atlas. - properties: - endpointId: - type: string - providerName: - type: string - region: - type: string - type: object - type: array - srvConnectionString: - type: string - type: - type: string - type: object - type: array - privateSrv: - type: string - standard: - type: string - standardSrv: - type: string - type: object - createDate: - type: string diskSizeGB: type: integer encryptionAtRestProvider: type: string - groupId: - type: string - id: - type: string labels: items: description: LabelSpec contains key-value pairs that tag and @@ -604,6 +573,10 @@ spec: mongoDBVersion: type: string name: + description: Name of the advanced deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string paused: type: boolean @@ -612,8 +585,6 @@ spec: replicationSpecs: items: properties: - id: - type: string numShards: type: integer regionConfigs: @@ -632,14 +603,9 @@ spec: type: integer type: object autoScaling: - description: AutoScalingSpec configures your deployment - to automatically scale its storage + description: AdvancedAutoScalingSpec configures your + deployment to automatically scale its storage properties: - autoIndexingEnabled: - description: Flag that indicates whether autopilot - mode for Performance Advisor is enabled. The - default is false. - type: boolean compute: description: Collection of settings that configure how a deployment might scale its deployment @@ -670,10 +636,13 @@ spec: : true.' type: boolean type: object - diskGBEnabled: + diskGB: description: Flag that indicates whether disk auto-scaling is enabled. The default is true. - type: boolean + properties: + enabled: + type: boolean + type: object type: object backingProviderName: type: string @@ -715,8 +684,6 @@ spec: type: array rootCertType: type: string - stateName: - type: string versionReleaseSystem: type: string type: object @@ -733,7 +700,7 @@ spec: - name type: object deploymentSpec: - description: Configuration for the advanced deployment API + description: Configuration for the normal (v1) deployment API https://www.mongodb.com/docs/atlas/reference/api/clusters/ properties: autoScaling: description: Collection of settings that configures auto-scaling @@ -841,7 +808,9 @@ spec: type: string name: description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + Atlas creates the deployment, you can't change its name. Can + only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string numShards: description: Positive integer that specifies the number of shards @@ -1063,11 +1032,13 @@ spec: - name type: object serverlessSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the serverless deployment API. https://www.mongodb.com/docs/atlas/reference/api/serverless-instances/ properties: name: - description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + description: Name of the serverless deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string providerSettings: description: Configuration for the provisioned hosts on which @@ -2102,7 +2073,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: mongodb/mongodb-atlas-kubernetes-operator:1.1.0 + image: mongodb/mongodb-atlas-kubernetes-operator:1.2.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/deploy/clusterwide/clusterwide-config.yaml b/deploy/clusterwide/clusterwide-config.yaml index beec752531..852dc7842a 100644 --- a/deploy/clusterwide/clusterwide-config.yaml +++ b/deploy/clusterwide/clusterwide-config.yaml @@ -256,7 +256,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: mongodb/mongodb-atlas-kubernetes-operator:1.1.0 + image: mongodb/mongodb-atlas-kubernetes-operator:1.2.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/deploy/clusterwide/crds.yaml b/deploy/clusterwide/crds.yaml index d76387ab96..cb80fd2cfe 100644 --- a/deploy/clusterwide/crds.yaml +++ b/deploy/clusterwide/crds.yaml @@ -47,10 +47,33 @@ spec: enum: - 1 - 2 + - 3 - 4 + - 5 - 6 + - 7 - 8 + - 9 + - 10 + - 11 - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 40 type: integer frequencyType: description: 'Frequency associated with the backup policy item. @@ -475,9 +498,12 @@ spec: type: object spec: description: AtlasDeploymentSpec defines the desired state of AtlasDeployment + Only one of DeploymentSpec, AdvancedDeploymentSpec and ServerlessSpec + should be defined properties: advancedDeploymentSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the advanced (v1.5) deployment API + https://www.mongodb.com/docs/atlas/reference/api/clusters-advanced/ properties: backupEnabled: type: boolean @@ -498,67 +524,10 @@ spec: type: object clusterType: type: string - connectionStrings: - description: ConnectionStrings configuration for applications - use to connect to this deployment. - properties: - awsPrivateLink: - additionalProperties: - type: string - type: object - awsPrivateLinkSrv: - additionalProperties: - type: string - type: object - private: - type: string - privateEndpoint: - items: - description: PrivateEndpointSpec connection strings. Each - object describes the connection strings you can use to - connect to this deployment through a private endpoint. - Atlas returns this parameter only if you deployed a private - endpoint to all regions to which you deployed this deployment's - nodes. - properties: - connectionString: - type: string - endpoints: - items: - description: EndpointSpec through which you connect - to Atlas. - properties: - endpointId: - type: string - providerName: - type: string - region: - type: string - type: object - type: array - srvConnectionString: - type: string - type: - type: string - type: object - type: array - privateSrv: - type: string - standard: - type: string - standardSrv: - type: string - type: object - createDate: - type: string diskSizeGB: type: integer encryptionAtRestProvider: type: string - groupId: - type: string - id: - type: string labels: items: description: LabelSpec contains key-value pairs that tag and @@ -579,6 +548,10 @@ spec: mongoDBVersion: type: string name: + description: Name of the advanced deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string paused: type: boolean @@ -587,8 +560,6 @@ spec: replicationSpecs: items: properties: - id: - type: string numShards: type: integer regionConfigs: @@ -607,14 +578,9 @@ spec: type: integer type: object autoScaling: - description: AutoScalingSpec configures your deployment - to automatically scale its storage + description: AdvancedAutoScalingSpec configures your + deployment to automatically scale its storage properties: - autoIndexingEnabled: - description: Flag that indicates whether autopilot - mode for Performance Advisor is enabled. The - default is false. - type: boolean compute: description: Collection of settings that configure how a deployment might scale its deployment @@ -645,10 +611,13 @@ spec: : true.' type: boolean type: object - diskGBEnabled: + diskGB: description: Flag that indicates whether disk auto-scaling is enabled. The default is true. - type: boolean + properties: + enabled: + type: boolean + type: object type: object backingProviderName: type: string @@ -690,8 +659,6 @@ spec: type: array rootCertType: type: string - stateName: - type: string versionReleaseSystem: type: string type: object @@ -708,7 +675,7 @@ spec: - name type: object deploymentSpec: - description: Configuration for the advanced deployment API + description: Configuration for the normal (v1) deployment API https://www.mongodb.com/docs/atlas/reference/api/clusters/ properties: autoScaling: description: Collection of settings that configures auto-scaling @@ -816,7 +783,9 @@ spec: type: string name: description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + Atlas creates the deployment, you can't change its name. Can + only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string numShards: description: Positive integer that specifies the number of shards @@ -1038,11 +1007,13 @@ spec: - name type: object serverlessSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the serverless deployment API. https://www.mongodb.com/docs/atlas/reference/api/serverless-instances/ properties: name: - description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + description: Name of the serverless deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string providerSettings: description: Configuration for the provisioned hosts on which diff --git a/deploy/crds/atlas.mongodb.com_atlasbackuppolicies.yaml b/deploy/crds/atlas.mongodb.com_atlasbackuppolicies.yaml index 57a494d36d..ff67432048 100644 --- a/deploy/crds/atlas.mongodb.com_atlasbackuppolicies.yaml +++ b/deploy/crds/atlas.mongodb.com_atlasbackuppolicies.yaml @@ -49,10 +49,33 @@ spec: enum: - 1 - 2 + - 3 - 4 + - 5 - 6 + - 7 - 8 + - 9 + - 10 + - 11 - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 40 type: integer frequencyType: description: 'Frequency associated with the backup policy item. diff --git a/deploy/crds/atlas.mongodb.com_atlasdeployments.yaml b/deploy/crds/atlas.mongodb.com_atlasdeployments.yaml index bb608045ae..88be0cd6fc 100644 --- a/deploy/crds/atlas.mongodb.com_atlasdeployments.yaml +++ b/deploy/crds/atlas.mongodb.com_atlasdeployments.yaml @@ -35,9 +35,12 @@ spec: type: object spec: description: AtlasDeploymentSpec defines the desired state of AtlasDeployment + Only one of DeploymentSpec, AdvancedDeploymentSpec and ServerlessSpec + should be defined properties: advancedDeploymentSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the advanced (v1.5) deployment API + https://www.mongodb.com/docs/atlas/reference/api/clusters-advanced/ properties: backupEnabled: type: boolean @@ -58,67 +61,10 @@ spec: type: object clusterType: type: string - connectionStrings: - description: ConnectionStrings configuration for applications - use to connect to this deployment. - properties: - awsPrivateLink: - additionalProperties: - type: string - type: object - awsPrivateLinkSrv: - additionalProperties: - type: string - type: object - private: - type: string - privateEndpoint: - items: - description: PrivateEndpointSpec connection strings. Each - object describes the connection strings you can use to - connect to this deployment through a private endpoint. - Atlas returns this parameter only if you deployed a private - endpoint to all regions to which you deployed this deployment's - nodes. - properties: - connectionString: - type: string - endpoints: - items: - description: EndpointSpec through which you connect - to Atlas. - properties: - endpointId: - type: string - providerName: - type: string - region: - type: string - type: object - type: array - srvConnectionString: - type: string - type: - type: string - type: object - type: array - privateSrv: - type: string - standard: - type: string - standardSrv: - type: string - type: object - createDate: - type: string diskSizeGB: type: integer encryptionAtRestProvider: type: string - groupId: - type: string - id: - type: string labels: items: description: LabelSpec contains key-value pairs that tag and @@ -139,6 +85,10 @@ spec: mongoDBVersion: type: string name: + description: Name of the advanced deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string paused: type: boolean @@ -147,8 +97,6 @@ spec: replicationSpecs: items: properties: - id: - type: string numShards: type: integer regionConfigs: @@ -167,14 +115,9 @@ spec: type: integer type: object autoScaling: - description: AutoScalingSpec configures your deployment - to automatically scale its storage + description: AdvancedAutoScalingSpec configures your + deployment to automatically scale its storage properties: - autoIndexingEnabled: - description: Flag that indicates whether autopilot - mode for Performance Advisor is enabled. The - default is false. - type: boolean compute: description: Collection of settings that configure how a deployment might scale its deployment @@ -205,10 +148,13 @@ spec: : true.' type: boolean type: object - diskGBEnabled: + diskGB: description: Flag that indicates whether disk auto-scaling is enabled. The default is true. - type: boolean + properties: + enabled: + type: boolean + type: object type: object backingProviderName: type: string @@ -250,8 +196,6 @@ spec: type: array rootCertType: type: string - stateName: - type: string versionReleaseSystem: type: string type: object @@ -268,7 +212,7 @@ spec: - name type: object deploymentSpec: - description: Configuration for the advanced deployment API + description: Configuration for the normal (v1) deployment API https://www.mongodb.com/docs/atlas/reference/api/clusters/ properties: autoScaling: description: Collection of settings that configures auto-scaling @@ -376,7 +320,9 @@ spec: type: string name: description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + Atlas creates the deployment, you can't change its name. Can + only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string numShards: description: Positive integer that specifies the number of shards @@ -598,11 +544,13 @@ spec: - name type: object serverlessSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the serverless deployment API. https://www.mongodb.com/docs/atlas/reference/api/serverless-instances/ properties: name: - description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + description: Name of the serverless deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string providerSettings: description: Configuration for the provisioned hosts on which diff --git a/deploy/namespaced/crds.yaml b/deploy/namespaced/crds.yaml index d76387ab96..cb80fd2cfe 100644 --- a/deploy/namespaced/crds.yaml +++ b/deploy/namespaced/crds.yaml @@ -47,10 +47,33 @@ spec: enum: - 1 - 2 + - 3 - 4 + - 5 - 6 + - 7 - 8 + - 9 + - 10 + - 11 - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 40 type: integer frequencyType: description: 'Frequency associated with the backup policy item. @@ -475,9 +498,12 @@ spec: type: object spec: description: AtlasDeploymentSpec defines the desired state of AtlasDeployment + Only one of DeploymentSpec, AdvancedDeploymentSpec and ServerlessSpec + should be defined properties: advancedDeploymentSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the advanced (v1.5) deployment API + https://www.mongodb.com/docs/atlas/reference/api/clusters-advanced/ properties: backupEnabled: type: boolean @@ -498,67 +524,10 @@ spec: type: object clusterType: type: string - connectionStrings: - description: ConnectionStrings configuration for applications - use to connect to this deployment. - properties: - awsPrivateLink: - additionalProperties: - type: string - type: object - awsPrivateLinkSrv: - additionalProperties: - type: string - type: object - private: - type: string - privateEndpoint: - items: - description: PrivateEndpointSpec connection strings. Each - object describes the connection strings you can use to - connect to this deployment through a private endpoint. - Atlas returns this parameter only if you deployed a private - endpoint to all regions to which you deployed this deployment's - nodes. - properties: - connectionString: - type: string - endpoints: - items: - description: EndpointSpec through which you connect - to Atlas. - properties: - endpointId: - type: string - providerName: - type: string - region: - type: string - type: object - type: array - srvConnectionString: - type: string - type: - type: string - type: object - type: array - privateSrv: - type: string - standard: - type: string - standardSrv: - type: string - type: object - createDate: - type: string diskSizeGB: type: integer encryptionAtRestProvider: type: string - groupId: - type: string - id: - type: string labels: items: description: LabelSpec contains key-value pairs that tag and @@ -579,6 +548,10 @@ spec: mongoDBVersion: type: string name: + description: Name of the advanced deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string paused: type: boolean @@ -587,8 +560,6 @@ spec: replicationSpecs: items: properties: - id: - type: string numShards: type: integer regionConfigs: @@ -607,14 +578,9 @@ spec: type: integer type: object autoScaling: - description: AutoScalingSpec configures your deployment - to automatically scale its storage + description: AdvancedAutoScalingSpec configures your + deployment to automatically scale its storage properties: - autoIndexingEnabled: - description: Flag that indicates whether autopilot - mode for Performance Advisor is enabled. The - default is false. - type: boolean compute: description: Collection of settings that configure how a deployment might scale its deployment @@ -645,10 +611,13 @@ spec: : true.' type: boolean type: object - diskGBEnabled: + diskGB: description: Flag that indicates whether disk auto-scaling is enabled. The default is true. - type: boolean + properties: + enabled: + type: boolean + type: object type: object backingProviderName: type: string @@ -690,8 +659,6 @@ spec: type: array rootCertType: type: string - stateName: - type: string versionReleaseSystem: type: string type: object @@ -708,7 +675,7 @@ spec: - name type: object deploymentSpec: - description: Configuration for the advanced deployment API + description: Configuration for the normal (v1) deployment API https://www.mongodb.com/docs/atlas/reference/api/clusters/ properties: autoScaling: description: Collection of settings that configures auto-scaling @@ -816,7 +783,9 @@ spec: type: string name: description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + Atlas creates the deployment, you can't change its name. Can + only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string numShards: description: Positive integer that specifies the number of shards @@ -1038,11 +1007,13 @@ spec: - name type: object serverlessSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the serverless deployment API. https://www.mongodb.com/docs/atlas/reference/api/serverless-instances/ properties: name: - description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + description: Name of the serverless deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string providerSettings: description: Configuration for the provisioned hosts on which diff --git a/deploy/namespaced/namespaced-config.yaml b/deploy/namespaced/namespaced-config.yaml index 63ef8b303c..2ec641f693 100644 --- a/deploy/namespaced/namespaced-config.yaml +++ b/deploy/namespaced/namespaced-config.yaml @@ -262,7 +262,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: mongodb/mongodb-atlas-kubernetes-operator:1.1.0 + image: mongodb/mongodb-atlas-kubernetes-operator:1.2.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/deploy/openshift/crds.yaml b/deploy/openshift/crds.yaml index d76387ab96..cb80fd2cfe 100644 --- a/deploy/openshift/crds.yaml +++ b/deploy/openshift/crds.yaml @@ -47,10 +47,33 @@ spec: enum: - 1 - 2 + - 3 - 4 + - 5 - 6 + - 7 - 8 + - 9 + - 10 + - 11 - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 40 type: integer frequencyType: description: 'Frequency associated with the backup policy item. @@ -475,9 +498,12 @@ spec: type: object spec: description: AtlasDeploymentSpec defines the desired state of AtlasDeployment + Only one of DeploymentSpec, AdvancedDeploymentSpec and ServerlessSpec + should be defined properties: advancedDeploymentSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the advanced (v1.5) deployment API + https://www.mongodb.com/docs/atlas/reference/api/clusters-advanced/ properties: backupEnabled: type: boolean @@ -498,67 +524,10 @@ spec: type: object clusterType: type: string - connectionStrings: - description: ConnectionStrings configuration for applications - use to connect to this deployment. - properties: - awsPrivateLink: - additionalProperties: - type: string - type: object - awsPrivateLinkSrv: - additionalProperties: - type: string - type: object - private: - type: string - privateEndpoint: - items: - description: PrivateEndpointSpec connection strings. Each - object describes the connection strings you can use to - connect to this deployment through a private endpoint. - Atlas returns this parameter only if you deployed a private - endpoint to all regions to which you deployed this deployment's - nodes. - properties: - connectionString: - type: string - endpoints: - items: - description: EndpointSpec through which you connect - to Atlas. - properties: - endpointId: - type: string - providerName: - type: string - region: - type: string - type: object - type: array - srvConnectionString: - type: string - type: - type: string - type: object - type: array - privateSrv: - type: string - standard: - type: string - standardSrv: - type: string - type: object - createDate: - type: string diskSizeGB: type: integer encryptionAtRestProvider: type: string - groupId: - type: string - id: - type: string labels: items: description: LabelSpec contains key-value pairs that tag and @@ -579,6 +548,10 @@ spec: mongoDBVersion: type: string name: + description: Name of the advanced deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string paused: type: boolean @@ -587,8 +560,6 @@ spec: replicationSpecs: items: properties: - id: - type: string numShards: type: integer regionConfigs: @@ -607,14 +578,9 @@ spec: type: integer type: object autoScaling: - description: AutoScalingSpec configures your deployment - to automatically scale its storage + description: AdvancedAutoScalingSpec configures your + deployment to automatically scale its storage properties: - autoIndexingEnabled: - description: Flag that indicates whether autopilot - mode for Performance Advisor is enabled. The - default is false. - type: boolean compute: description: Collection of settings that configure how a deployment might scale its deployment @@ -645,10 +611,13 @@ spec: : true.' type: boolean type: object - diskGBEnabled: + diskGB: description: Flag that indicates whether disk auto-scaling is enabled. The default is true. - type: boolean + properties: + enabled: + type: boolean + type: object type: object backingProviderName: type: string @@ -690,8 +659,6 @@ spec: type: array rootCertType: type: string - stateName: - type: string versionReleaseSystem: type: string type: object @@ -708,7 +675,7 @@ spec: - name type: object deploymentSpec: - description: Configuration for the advanced deployment API + description: Configuration for the normal (v1) deployment API https://www.mongodb.com/docs/atlas/reference/api/clusters/ properties: autoScaling: description: Collection of settings that configures auto-scaling @@ -816,7 +783,9 @@ spec: type: string name: description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + Atlas creates the deployment, you can't change its name. Can + only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string numShards: description: Positive integer that specifies the number of shards @@ -1038,11 +1007,13 @@ spec: - name type: object serverlessSpec: - description: Configuration for the advanced deployment API. https://docs.atlas.mongodb.com/reference/api/deployments-advanced/ + description: Configuration for the serverless deployment API. https://www.mongodb.com/docs/atlas/reference/api/serverless-instances/ properties: name: - description: Name of the deployment as it appears in Atlas. After - Atlas creates the deployment, you can't change its name. + description: Name of the serverless deployment as it appears in + Atlas. After Atlas creates the deployment, you can't change + its name. Can only contain ASCII letters, numbers, and hyphens. + pattern: ^[a-zA-Z0-9][a-zA-Z0-9-]*$ type: string providerSettings: description: Configuration for the provisioned hosts on which diff --git a/deploy/openshift/openshift.yaml b/deploy/openshift/openshift.yaml index 740eba367b..9ad09b0a1d 100644 --- a/deploy/openshift/openshift.yaml +++ b/deploy/openshift/openshift.yaml @@ -261,7 +261,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: mongodb/mongodb-atlas-kubernetes-operator:1.1.0 + image: mongodb/mongodb-atlas-kubernetes-operator:1.2.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/third_party_licenses.txt b/third_party_licenses.txt index 05fbf869af..55af127ad7 100644 --- a/third_party_licenses.txt +++ b/third_party_licenses.txt @@ -22,7 +22,7 @@ github.com/json-iterator/go,https://github.com/json-iterator/go/blob/v1.1.12/LIC github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/c182affec369/LICENSE,Apache-2.0 github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0 github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0 -github.com/mongodb-forks/digest,https://github.com/mongodb-forks/digest/blob/v1.0.3/COPYING,Apache-2.0 +github.com/mongodb-forks/digest,https://github.com/mongodb-forks/digest/blob/v1.0.4/COPYING,Apache-2.0 github.com/openlyinc/pointy,https://github.com/openlyinc/pointy/blob/v1.1.2/LICENSE,MIT github.com/pkg/errors,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.12.1/LICENSE,Apache-2.0