core: persist VolumeClaimTemplate metadtata
Allow metadata on VolumeClaimTemplates in StorageClassDeviceSets to be persisted. The latest changes to controller-gen allows us to embed objectmeta for embedded types. Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
This commit is contained in:
5 files changed
+4226
-4088
No files matched your search
@@ -21,7 +21,8 @@ all: build
|
||||
# Build Options
|
||||
|
||||
# Controller-gen version
|
||||
CONTROLLER_GEN_VERSION=v0.5.0
|
||||
# f284e2e8... is master ahead of v0.5.0 which has ability to generate embedded objectmeta in CRDs
|
||||
CONTROLLER_GEN_VERSION=f284e2e8098cb0193c2b0c7c1c651ae75496539b
|
||||
|
||||
# Set GOBIN
|
||||
ifeq (,$(shell go env GOBIN))
|
||||
|
||||
@@ -22,7 +22,7 @@ CONTROLLER_GEN_BIN_PATH=$1
|
||||
YQ_BIN_PATH=$2
|
||||
: "${MAX_DESC_LEN:=-1}"
|
||||
# allowDangerousTypes is used to accept float64
|
||||
CRD_OPTIONS="crd:maxDescLen=$MAX_DESC_LEN,trivialVersions=true,allowDangerousTypes=true"
|
||||
CRD_OPTIONS="crd:maxDescLen=$MAX_DESC_LEN,trivialVersions=true,generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
|
||||
OLM_CATALOG_DIR="${SCRIPT_ROOT}/cluster/olm/ceph/deploy/crds"
|
||||
CRDS_FILE_PATH="${SCRIPT_ROOT}/cluster/examples/kubernetes/ceph/crds.yaml"
|
||||
HELM_CRDS_FILE_PATH="${SCRIPT_ROOT}/cluster/charts/rook-ceph/templates/resources.yaml"
|
||||
@@ -41,15 +41,6 @@ copy_ob_obc_crds() {
|
||||
generating_crds_v1() {
|
||||
echo "Generating v1 in crds.yaml"
|
||||
"$CONTROLLER_GEN_BIN_PATH" "$CRD_OPTIONS" paths="./pkg/apis/ceph.rook.io/v1" output:crd:artifacts:config="$OLM_CATALOG_DIR"
|
||||
$YQ_BIN_PATH w -i cluster/olm/ceph/deploy/crds/ceph.rook.io_cephclusters.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.mon.properties.stretchCluster.properties.zones.items.properties.volumeClaimTemplate.properties.metadata.x-kubernetes-preserve-unknown-fields true
|
||||
$YQ_BIN_PATH w -i cluster/olm/ceph/deploy/crds/ceph.rook.io_cephclusters.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.mon.properties.volumeClaimTemplate.properties.metadata.x-kubernetes-preserve-unknown-fields true
|
||||
$YQ_BIN_PATH w -i cluster/olm/ceph/deploy/crds/ceph.rook.io_cephclusters.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.storage.properties.volumeClaimTemplates.items.properties.metadata.x-kubernetes-preserve-unknown-fields true
|
||||
$YQ_BIN_PATH w -i cluster/olm/ceph/deploy/crds/ceph.rook.io_cephclusters.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.storage.properties.nodes.items.properties.volumeClaimTemplates.items.properties.metadata.x-kubernetes-preserve-unknown-fields true
|
||||
$YQ_BIN_PATH w -i cluster/olm/ceph/deploy/crds/ceph.rook.io_cephclusters.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.storage.properties.storageClassDeviceSets.items.properties.volumeClaimTemplates.items.properties.metadata.x-kubernetes-preserve-unknown-fields true
|
||||
# fixes a bug in yq: https://github.com/mikefarah/yq/issues/351 where the '---' gets removed
|
||||
sed -i'' -e '1i\
|
||||
---
|
||||
' cluster/olm/ceph/deploy/crds/ceph.rook.io_cephclusters.yaml
|
||||
}
|
||||
|
||||
generating_crds_v1alpha2() {
|
||||
@@ -115,7 +106,10 @@ generate_vol_rep_crds
|
||||
generating_main_crd
|
||||
|
||||
for crd in "$OLM_CATALOG_DIR/"*.yaml; do
|
||||
cat "$crd" >> "$CRDS_FILE_PATH"
|
||||
echo "---" >> "$CRDS_FILE_PATH" # yq doesn't output doc separators
|
||||
# Process each intermediate CRD file with yq to enforce consistent formatting in the final product
|
||||
# regardless of whether yq was used in previous steps to alter CRD intermediate files.
|
||||
$YQ_BIN_PATH read "$crd" >> "$CRDS_FILE_PATH"
|
||||
done
|
||||
|
||||
build_helm_resources
|
||||
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephblockpools.ceph.rook.io
|
||||
@@ -329,7 +329,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephclients.ceph.rook.io
|
||||
@@ -400,7 +400,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephclusters.ceph.rook.io
|
||||
@@ -812,8 +812,24 @@ spec:
|
||||
type: string
|
||||
metadata:
|
||||
description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
|
||||
properties:
|
||||
annotations:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
finalizers:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
labels:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
x-kubernetes-preserve-unknown-fields: true
|
||||
spec:
|
||||
description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
|
||||
properties:
|
||||
@@ -967,8 +983,24 @@ spec:
|
||||
type: string
|
||||
metadata:
|
||||
description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
|
||||
properties:
|
||||
annotations:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
finalizers:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
labels:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
x-kubernetes-preserve-unknown-fields: true
|
||||
spec:
|
||||
description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
|
||||
properties:
|
||||
@@ -1789,8 +1821,24 @@ spec:
|
||||
type: string
|
||||
metadata:
|
||||
description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
|
||||
properties:
|
||||
annotations:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
finalizers:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
labels:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
x-kubernetes-preserve-unknown-fields: true
|
||||
spec:
|
||||
description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
|
||||
properties:
|
||||
@@ -2836,8 +2884,24 @@ spec:
|
||||
type: string
|
||||
metadata:
|
||||
description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
|
||||
properties:
|
||||
annotations:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
finalizers:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
labels:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
x-kubernetes-preserve-unknown-fields: true
|
||||
spec:
|
||||
description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
|
||||
properties:
|
||||
@@ -2976,7 +3040,6 @@ spec:
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
x-kubernetes-preserve-unknown-fields: true
|
||||
required:
|
||||
- count
|
||||
- name
|
||||
@@ -3002,8 +3065,24 @@ spec:
|
||||
type: string
|
||||
metadata:
|
||||
description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
|
||||
properties:
|
||||
annotations:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
finalizers:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
labels:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
x-kubernetes-preserve-unknown-fields: true
|
||||
spec:
|
||||
description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
|
||||
properties:
|
||||
@@ -4222,7 +4301,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephfilesystemmirrors.ceph.rook.io
|
||||
@@ -4731,7 +4810,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephfilesystems.ceph.rook.io
|
||||
@@ -5555,7 +5634,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephnfses.ceph.rook.io
|
||||
@@ -6099,7 +6178,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephobjectrealms.ceph.rook.io
|
||||
@@ -6165,7 +6244,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephobjectstores.ceph.rook.io
|
||||
@@ -7166,7 +7245,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephobjectstoreusers.ceph.rook.io
|
||||
@@ -7236,7 +7315,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephobjectzonegroups.ceph.rook.io
|
||||
@@ -7297,7 +7376,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephobjectzones.ceph.rook.io
|
||||
@@ -7626,7 +7705,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: cephrbdmirrors.ceph.rook.io
|
||||
@@ -8273,7 +8352,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: volumereplicationclasses.replication.storage.openshift.io
|
||||
@@ -8332,7 +8411,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: volumereplications.replication.storage.openshift.io
|
||||
@@ -8467,7 +8546,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.5.0
|
||||
controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c
|
||||
helm.sh/resource-policy: keep
|
||||
creationTimestamp: null
|
||||
name: volumes.rook.io
|
||||
|
||||
+4119
-4054
File diff suppressed because it is too large.
Load diff
@@ -189,7 +189,6 @@ type StorageClassDeviceSet struct {
|
||||
// +optional
|
||||
Config map[string]string `json:"config,omitempty"`
|
||||
// VolumeClaimTemplates is a list of PVC templates for the underlying storage devices
|
||||
// +kubebuilder:pruning:PreserveUnknownFields
|
||||
VolumeClaimTemplates []v1.PersistentVolumeClaim `json:"volumeClaimTemplates"`
|
||||
// Portable represents OSD portability across the hosts
|
||||
// +optional
|
||||
|
||||
Reference in new issue
Block a user