diff --git a/.changelog/2613.txt b/.changelog/2613.txt new file mode 100644 index 0000000000..b03cc5bf78 --- /dev/null +++ b/.changelog/2613.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +Removed deprecated support for CephFS volumes in the Kubernetes provider to align with updated Kubernetes storage options. +``` \ No newline at end of file diff --git a/docs/data-sources/persistent_volume_v1.md b/docs/data-sources/persistent_volume_v1.md index ed9fc87ecb..6cdeb61751 100644 --- a/docs/data-sources/persistent_volume_v1.md +++ b/docs/data-sources/persistent_volume_v1.md @@ -66,7 +66,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--persistent_volume_source--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--persistent_volume_source--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--persistent_volume_source--cinder)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--persistent_volume_source--csi)) - `fc` (Block List, Max: 1) Represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--fc)) @@ -127,31 +126,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.persistent_volume_source.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--persistent_volume_source--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.persistent_volume_source.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.persistent_volume_source.cinder` diff --git a/docs/resources/cron_job.md b/docs/resources/cron_job.md index c8042befb6..2709936d9d 100644 --- a/docs/resources/cron_job.md +++ b/docs/resources/cron_job.md @@ -1650,7 +1650,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--csi)) @@ -1719,32 +1718,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.job_template.spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.job_template.spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.job_template.spec.template.spec.volume.cinder` diff --git a/docs/resources/cron_job_v1.md b/docs/resources/cron_job_v1.md index c5c7ea1d54..e8d9adfc3a 100644 --- a/docs/resources/cron_job_v1.md +++ b/docs/resources/cron_job_v1.md @@ -1645,7 +1645,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--csi)) @@ -1715,31 +1714,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.job_template.spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--job_template--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.job_template.spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.job_template.spec.template.spec.volume.cinder` diff --git a/docs/resources/daemon_set_v1.md b/docs/resources/daemon_set_v1.md index 59ba45b42d..664423a70d 100644 --- a/docs/resources/daemon_set_v1.md +++ b/docs/resources/daemon_set_v1.md @@ -1595,7 +1595,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1665,31 +1664,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/daemonset.md b/docs/resources/daemonset.md index 582da60be2..d37f7fd94f 100644 --- a/docs/resources/daemonset.md +++ b/docs/resources/daemonset.md @@ -1595,7 +1595,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1664,32 +1663,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/deployment.md b/docs/resources/deployment.md index 1fa160f220..d3c612301b 100644 --- a/docs/resources/deployment.md +++ b/docs/resources/deployment.md @@ -1595,7 +1595,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1664,32 +1663,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/deployment_v1.md b/docs/resources/deployment_v1.md index 049de98022..d265a0dae8 100644 --- a/docs/resources/deployment_v1.md +++ b/docs/resources/deployment_v1.md @@ -1603,7 +1603,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1672,32 +1671,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/job.md b/docs/resources/job.md index 73dacd7813..2f0eaac761 100644 --- a/docs/resources/job.md +++ b/docs/resources/job.md @@ -1603,7 +1603,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1673,31 +1672,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/job_v1.md b/docs/resources/job_v1.md index 32296bb876..890b20d2bb 100644 --- a/docs/resources/job_v1.md +++ b/docs/resources/job_v1.md @@ -1601,7 +1601,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1670,32 +1669,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/persistent_volume.md b/docs/resources/persistent_volume.md index 21b6a8f0c1..004b2ad4b6 100644 --- a/docs/resources/persistent_volume.md +++ b/docs/resources/persistent_volume.md @@ -67,7 +67,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--persistent_volume_source--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--persistent_volume_source--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--persistent_volume_source--cinder)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--persistent_volume_source--csi)) - `fc` (Block List, Max: 1) Represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--fc)) @@ -128,31 +127,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.persistent_volume_source.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--persistent_volume_source--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.persistent_volume_source.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.persistent_volume_source.cinder` diff --git a/docs/resources/persistent_volume_v1.md b/docs/resources/persistent_volume_v1.md index 89da63119a..7f87b4eec8 100644 --- a/docs/resources/persistent_volume_v1.md +++ b/docs/resources/persistent_volume_v1.md @@ -67,7 +67,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--persistent_volume_source--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--persistent_volume_source--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--persistent_volume_source--cinder)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--persistent_volume_source--csi)) - `fc` (Block List, Max: 1) Represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. (see [below for nested schema](#nestedblock--spec--persistent_volume_source--fc)) @@ -128,31 +127,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.persistent_volume_source.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--persistent_volume_source--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.persistent_volume_source.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.persistent_volume_source.cinder` diff --git a/docs/resources/pod.md b/docs/resources/pod.md index 548a508040..b5c8e4391b 100644 --- a/docs/resources/pod.md +++ b/docs/resources/pod.md @@ -1556,7 +1556,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--volume--csi)) @@ -1625,32 +1624,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.volume.cinder` diff --git a/docs/resources/pod_v1.md b/docs/resources/pod_v1.md index 957dd320da..8b4ee40ac3 100644 --- a/docs/resources/pod_v1.md +++ b/docs/resources/pod_v1.md @@ -1554,7 +1554,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--volume--csi)) @@ -1624,31 +1623,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.volume.cinder` diff --git a/docs/resources/replication_controller.md b/docs/resources/replication_controller.md index e08a5ce4bb..e53b3f67ef 100644 --- a/docs/resources/replication_controller.md +++ b/docs/resources/replication_controller.md @@ -1592,7 +1592,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1662,31 +1661,6 @@ Optional: - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/replication_controller_v1.md b/docs/resources/replication_controller_v1.md index e83f7c6969..ccc24562a7 100644 --- a/docs/resources/replication_controller_v1.md +++ b/docs/resources/replication_controller_v1.md @@ -1590,7 +1590,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1659,32 +1658,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/stateful_set.md b/docs/resources/stateful_set.md index dde06232ef..4fb3ea993a 100644 --- a/docs/resources/stateful_set.md +++ b/docs/resources/stateful_set.md @@ -1622,7 +1622,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1691,32 +1690,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/docs/resources/stateful_set_v1.md b/docs/resources/stateful_set_v1.md index 911677fe8a..1d2f3cd0aa 100644 --- a/docs/resources/stateful_set_v1.md +++ b/docs/resources/stateful_set_v1.md @@ -1627,7 +1627,6 @@ Optional: - `aws_elastic_block_store` (Block List, Max: 1) Represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore (see [below for nested schema](#nestedblock--spec--template--spec--volume--aws_elastic_block_store)) - `azure_disk` (Block List, Max: 1) Represents an Azure Data Disk mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_disk)) - `azure_file` (Block List, Max: 1) Represents an Azure File Service mount on the host and bind mount to the pod. (see [below for nested schema](#nestedblock--spec--template--spec--volume--azure_file)) -- `ceph_fs` (Block List, Max: 1) Represents a Ceph FS mount on the host that shares a pod's lifetime (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs)) - `cinder` (Block List, Max: 1) Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md (see [below for nested schema](#nestedblock--spec--template--spec--volume--cinder)) - `config_map` (Block List, Max: 1) ConfigMap represents a configMap that should populate this volume (see [below for nested schema](#nestedblock--spec--template--spec--volume--config_map)) - `csi` (Block List, Max: 1) Represents a CSI Volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#csi (see [below for nested schema](#nestedblock--spec--template--spec--volume--csi)) @@ -1696,32 +1695,6 @@ Optional: - `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to false (read/write). - `secret_namespace` (String) The namespace of the secret that contains Azure Storage Account Name and Key. For Kubernetes up to 1.18.x the default is the same as the Pod. For Kubernetes 1.19.x and later the default is "default" namespace. - - -### Nested Schema for `spec.template.spec.volume.ceph_fs` - -Required: - -- `monitors` (Set of String) Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - -Optional: - -- `path` (String) Used as the mounted root, rather than the full Ceph tree, default is / -- `read_only` (Boolean) Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_file` (String) The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it -- `secret_ref` (Block List, Max: 1) Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it (see [below for nested schema](#nestedblock--spec--template--spec--volume--ceph_fs--secret_ref)) -- `user` (String) User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it - - -### Nested Schema for `spec.template.spec.volume.ceph_fs.secret_ref` - -Optional: - -- `name` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -- `namespace` (String) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - - - ### Nested Schema for `spec.template.spec.volume.cinder` diff --git a/kubernetes/resource_kubernetes_persistent_volume_v1_test.go b/kubernetes/resource_kubernetes_persistent_volume_v1_test.go index 163b5e0566..a832b8e2e6 100644 --- a/kubernetes/resource_kubernetes_persistent_volume_v1_test.go +++ b/kubernetes/resource_kubernetes_persistent_volume_v1_test.go @@ -544,45 +544,6 @@ func TestAccKubernetesPersistentVolumeV1_local_volumeSource(t *testing.T) { }) } -func TestAccKubernetesPersistentVolumeV1_cephFsSecretRef(t *testing.T) { - var conf api.PersistentVolume - randString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) - name := fmt.Sprintf("tf-acc-test-%s", randString) - resourceName := "kubernetes_persistent_volume_v1.test" - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: resourceName, - IDRefreshIgnore: []string{"metadata.0.resource_version"}, - ProviderFactories: testAccProviderFactories, - CheckDestroy: testAccCheckKubernetesPersistentVolumeV1Destroy, - Steps: []resource.TestStep{ - { - Config: testAccKubernetesPersistentVolumeV1Config_cephFsSecretRef(name), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckKubernetesPersistentVolumeV1Exists(resourceName, &conf), - resource.TestCheckResourceAttr(resourceName, "metadata.0.annotations.%", "0"), - resource.TestCheckResourceAttr(resourceName, "metadata.0.labels.%", "0"), - resource.TestCheckResourceAttr(resourceName, "metadata.0.name", name), - resource.TestCheckResourceAttrSet(resourceName, "metadata.0.generation"), - resource.TestCheckResourceAttrSet(resourceName, "metadata.0.resource_version"), - resource.TestCheckResourceAttrSet(resourceName, "metadata.0.uid"), - resource.TestCheckResourceAttr(resourceName, "spec.0.capacity.%", "1"), - resource.TestCheckResourceAttr(resourceName, "spec.0.capacity.storage", "2Gi"), - resource.TestCheckResourceAttr(resourceName, "spec.0.access_modes.#", "1"), - resource.TestCheckResourceAttr(resourceName, "spec.0.access_modes.0", "ReadWriteMany"), - resource.TestCheckResourceAttr(resourceName, "spec.0.persistent_volume_source.0.ceph_fs.#", "1"), - resource.TestCheckResourceAttr(resourceName, "spec.0.persistent_volume_source.0.ceph_fs.0.monitors.#", "2"), - resource.TestCheckResourceAttr(resourceName, "spec.0.persistent_volume_source.0.ceph_fs.0.monitors.0", "10.16.154.78:6789"), - resource.TestCheckResourceAttr(resourceName, "spec.0.persistent_volume_source.0.ceph_fs.0.monitors.1", "10.16.154.82:6789"), - resource.TestCheckResourceAttr(resourceName, "spec.0.persistent_volume_source.0.ceph_fs.0.secret_ref.#", "1"), - resource.TestCheckResourceAttr(resourceName, "spec.0.persistent_volume_source.0.ceph_fs.0.secret_ref.0.name", "ceph-secret"), - ), - }, - }, - }) -} - func TestAccKubernetesPersistentVolumeV1_storageClass(t *testing.T) { var conf api.PersistentVolume randString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) @@ -1756,33 +1717,6 @@ func testAccKubernetesPersistentVolumeV1Config_local_volumeSource(name, storage, `, name, storage, path, hostname) } -func testAccKubernetesPersistentVolumeV1Config_cephFsSecretRef(name string) string { - return fmt.Sprintf(`resource "kubernetes_persistent_volume_v1" "test" { - metadata { - name = "%s" - } - - spec { - capacity = { - storage = "2Gi" - } - - access_modes = ["ReadWriteMany"] - - persistent_volume_source { - ceph_fs { - monitors = ["10.16.154.78:6789", "10.16.154.82:6789"] - - secret_ref { - name = "ceph-secret" - } - } - } - } -} -`, name) -} - func testAccKubernetesPersistentVolumeV1Config_storageClass(name, diskName, storageClassName, storageClassName2, zone, refName string) string { return fmt.Sprintf(`resource "kubernetes_persistent_volume_v1" "test" { metadata { diff --git a/kubernetes/schema_volume_source.go b/kubernetes/schema_volume_source.go index 2317947e78..900eb77bfd 100644 --- a/kubernetes/schema_volume_source.go +++ b/kubernetes/schema_volume_source.go @@ -197,44 +197,6 @@ func commonVolumeSources() map[string]*schema.Schema { }, }, }, - "ceph_fs": { - Type: schema.TypeList, - Description: "Represents a Ceph FS mount on the host that shares a pod's lifetime", - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "monitors": { - Type: schema.TypeSet, - Description: "Monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - Required: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "path": { - Type: schema.TypeString, - Description: "Used as the mounted root, rather than the full Ceph tree, default is /", - Optional: true, - }, - "read_only": { - Type: schema.TypeBool, - Description: "Whether to force the read-only setting in VolumeMounts. Defaults to `false` (read/write). More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - Optional: true, - }, - "secret_file": { - Type: schema.TypeString, - Description: "The path to key ring for User, default is `/etc/ceph/user.secret`. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - Optional: true, - }, - "secret_ref": commonVolumeSourcesSecretRef("Reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it"), - "user": { - Type: schema.TypeString, - Description: "User is the rados user name, default is admin. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - Optional: true, - }, - }, - }, - }, "cinder": { Type: schema.TypeList, Description: "Represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md", diff --git a/kubernetes/structure_persistent_volume_spec.go b/kubernetes/structure_persistent_volume_spec.go index 2915d8ed7f..39be1b6413 100644 --- a/kubernetes/structure_persistent_volume_spec.go +++ b/kubernetes/structure_persistent_volume_spec.go @@ -67,48 +67,6 @@ func flattenAzureFilePersistentVolumeSource(in *v1.AzureFilePersistentVolumeSour return []interface{}{att} } -func flattenCephFSVolumeSource(in *v1.CephFSVolumeSource) []interface{} { - att := make(map[string]interface{}) - att["monitors"] = newStringSet(schema.HashString, in.Monitors) - if in.Path != "" { - att["path"] = in.Path - } - if in.User != "" { - att["user"] = in.User - } - if in.SecretFile != "" { - att["secret_file"] = in.SecretFile - } - if in.SecretRef != nil { - att["secret_ref"] = flattenLocalObjectReference(in.SecretRef) - } - if in.ReadOnly { - att["read_only"] = in.ReadOnly - } - return []interface{}{att} -} - -func flattenCephFSPersistentVolumeSource(in *v1.CephFSPersistentVolumeSource) []interface{} { - att := make(map[string]interface{}) - att["monitors"] = newStringSet(schema.HashString, in.Monitors) - if in.Path != "" { - att["path"] = in.Path - } - if in.User != "" { - att["user"] = in.User - } - if in.SecretFile != "" { - att["secret_file"] = in.SecretFile - } - if in.SecretRef != nil { - att["secret_ref"] = flattenSecretReference(in.SecretRef) - } - if in.ReadOnly { - att["read_only"] = in.ReadOnly - } - return []interface{}{att} -} - func flattenCinderPersistentVolumeSource(in *v1.CinderPersistentVolumeSource) []interface{} { att := make(map[string]interface{}) att["volume_id"] = in.VolumeID @@ -343,9 +301,6 @@ func flattenPersistentVolumeSource(in v1.PersistentVolumeSource) []interface{} { if in.Cinder != nil { att["cinder"] = flattenCinderPersistentVolumeSource(in.Cinder) } - if in.CephFS != nil { - att["ceph_fs"] = flattenCephFSPersistentVolumeSource(in.CephFS) - } if in.FC != nil { att["fc"] = flattenFCVolumeSource(in.FC) } @@ -625,58 +580,6 @@ func expandAzureFilePersistentVolumeSource(l []interface{}) *v1.AzureFilePersist return obj } -func expandCephFSVolumeSource(l []interface{}) *v1.CephFSVolumeSource { - if len(l) == 0 || l[0] == nil { - return &v1.CephFSVolumeSource{} - } - in := l[0].(map[string]interface{}) - obj := &v1.CephFSVolumeSource{ - Monitors: sliceOfString(in["monitors"].(*schema.Set).List()), - } - if v, ok := in["path"].(string); ok { - obj.Path = v - } - if v, ok := in["user"].(string); ok { - obj.User = v - } - if v, ok := in["secret_file"].(string); ok { - obj.SecretFile = v - } - if v, ok := in["secret_ref"].([]interface{}); ok && len(v) > 0 { - obj.SecretRef = expandLocalObjectReference(v) - } - if v, ok := in["read_only"].(bool); ok { - obj.ReadOnly = v - } - return obj -} - -func expandCephFSPersistentVolumeSource(l []interface{}) *v1.CephFSPersistentVolumeSource { - if len(l) == 0 || l[0] == nil { - return &v1.CephFSPersistentVolumeSource{} - } - in := l[0].(map[string]interface{}) - obj := &v1.CephFSPersistentVolumeSource{ - Monitors: sliceOfString(in["monitors"].(*schema.Set).List()), - } - if v, ok := in["path"].(string); ok { - obj.Path = v - } - if v, ok := in["user"].(string); ok { - obj.User = v - } - if v, ok := in["secret_file"].(string); ok { - obj.SecretFile = v - } - if v, ok := in["secret_ref"].([]interface{}); ok && len(v) > 0 { - obj.SecretRef = expandSecretReference(v) - } - if v, ok := in["read_only"].(bool); ok { - obj.ReadOnly = v - } - return obj -} - func expandCinderPersistentVolumeSource(l []interface{}) *v1.CinderPersistentVolumeSource { if len(l) == 0 || l[0] == nil { return &v1.CinderPersistentVolumeSource{} @@ -984,9 +887,6 @@ func expandPersistentVolumeSource(l []interface{}) v1.PersistentVolumeSource { if v, ok := in["cinder"].([]interface{}); ok && len(v) > 0 { obj.Cinder = expandCinderPersistentVolumeSource(v) } - if v, ok := in["ceph_fs"].([]interface{}); ok && len(v) > 0 { - obj.CephFS = expandCephFSPersistentVolumeSource(v) - } if v, ok := in["fc"].([]interface{}); ok && len(v) > 0 { obj.FC = expandFCVolumeSource(v) } @@ -1522,28 +1422,6 @@ func patchPersistentVolumeSource(pathPrefix, prefix string, d *schema.ResourceDa } } - if d.HasChange(prefix + "ceph_fs") { - oldIn, newIn := d.GetChange(prefix + "ceph_fs") - oldV, oldOk := oldIn.([]interface{}) - newV, newOk := newIn.([]interface{}) - - if newOk && len(newV) > 0 { - if oldOk && len(oldV) > 0 { - ops = append(ops, &ReplaceOperation{ - Path: pathPrefix + "/cephfs", - Value: expandCephFSVolumeSource(newV), - }) - } else { - ops = append(ops, &AddOperation{ - Path: pathPrefix + "/cephfs", - Value: expandCephFSVolumeSource(newV), - }) - } - } else if oldOk && len(oldV) > 0 { - ops = append(ops, &RemoveOperation{Path: pathPrefix + "/cephfs"}) - } - } - if d.HasChange(prefix + "fc") { oldIn, newIn := d.GetChange(prefix + "fc") oldV, oldOk := oldIn.([]interface{}) diff --git a/kubernetes/structures_pod.go b/kubernetes/structures_pod.go index ea5ccfdb86..6ab2427de7 100644 --- a/kubernetes/structures_pod.go +++ b/kubernetes/structures_pod.go @@ -410,9 +410,6 @@ func flattenVolumes(volumes []v1.Volume) []interface{} { if v.Cinder != nil { obj["cinder"] = flattenCinderVolumeSource(v.Cinder) } - if v.CephFS != nil { - obj["ceph_fs"] = flattenCephFSVolumeSource(v.CephFS) - } if v.CSI != nil { obj["csi"] = flattenCSIVolumeSource(v.CSI) } @@ -1604,9 +1601,6 @@ func expandVolumes(volumes []interface{}) ([]v1.Volume, error) { if v, ok := m["cinder"].([]interface{}); ok && len(v) > 0 { vl[i].Cinder = expandCinderVolumeSource(v) } - if v, ok := m["ceph_fs"].([]interface{}); ok && len(v) > 0 { - vl[i].CephFS = expandCephFSVolumeSource(v) - } if v, ok := m["csi"].([]interface{}); ok && len(v) > 0 { vl[i].CSI = expandCSIVolumeSource(v) } diff --git a/manifest/openapi/testdata/k8s-swagger.json b/manifest/openapi/testdata/k8s-swagger.json index 7c64728a2e..96660e67a8 100644 --- a/manifest/openapi/testdata/k8s-swagger.json +++ b/manifest/openapi/testdata/k8s-swagger.json @@ -80282,78 +80282,6 @@ } } }, - "io.k8s.api.core.v1.CephFSPersistentVolumeSource": { - "description": "Represents a Ceph Filesystem mount that lasts the lifetime of a pod Cephfs volumes do not support ownership management or SELinux relabeling.", - "type": "object", - "required": [ - "monitors" - ], - "properties": { - "monitors": { - "description": "Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "array", - "items": { - "type": "string" - } - }, - "path": { - "description": "Optional: Used as the mounted root, rather than the full Ceph tree, default is /", - "type": "string" - }, - "readOnly": { - "description": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "boolean" - }, - "secretFile": { - "description": "Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "string" - }, - "secretRef": { - "description": "Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" - }, - "user": { - "description": "Optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "string" - } - } - }, - "io.k8s.api.core.v1.CephFSVolumeSource": { - "description": "Represents a Ceph Filesystem mount that lasts the lifetime of a pod Cephfs volumes do not support ownership management or SELinux relabeling.", - "type": "object", - "required": [ - "monitors" - ], - "properties": { - "monitors": { - "description": "Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "array", - "items": { - "type": "string" - } - }, - "path": { - "description": "Optional: Used as the mounted root, rather than the full Ceph tree, default is /", - "type": "string" - }, - "readOnly": { - "description": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "boolean" - }, - "secretFile": { - "description": "Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "string" - }, - "secretRef": { - "description": "Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" - }, - "user": { - "description": "Optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it", - "type": "string" - } - } - }, "io.k8s.api.core.v1.CinderPersistentVolumeSource": { "description": "Represents a cinder volume resource in Openstack. A Cinder volume must exist before mounting to a container. The volume must also be in the same region as the kubelet. Cinder volumes support ownership management and SELinux relabeling.", "type": "object", @@ -83173,10 +83101,6 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" } }, - "cephfs": { - "description": "CephFS represents a Ceph FS mount on the host that shares a pod's lifetime", - "$ref": "#/definitions/io.k8s.api.core.v1.CephFSPersistentVolumeSource" - }, "cinder": { "description": "Cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md", "$ref": "#/definitions/io.k8s.api.core.v1.CinderPersistentVolumeSource" @@ -85481,10 +85405,6 @@ "description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod.", "$ref": "#/definitions/io.k8s.api.core.v1.AzureFileVolumeSource" }, - "cephfs": { - "description": "CephFS represents a Ceph FS mount on the host that shares a pod's lifetime", - "$ref": "#/definitions/io.k8s.api.core.v1.CephFSVolumeSource" - }, "cinder": { "description": "Cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md", "$ref": "#/definitions/io.k8s.api.core.v1.CinderVolumeSource"