From 64e74f9623f8a27b102198b91cf50bdc2e0ff685 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 11:15:41 -0700 Subject: [PATCH 1/4] Use +default for now deprecated RBD volume THis leaves us less hand-written code and a better schema. Kubernetes-commit: 03f0110b953a171bfc985fc65a40ffe6820a6007 --- applyconfigurations/internal/internal.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/applyconfigurations/internal/internal.go b/applyconfigurations/internal/internal.go index 4b500dee..f2235f31 100644 --- a/applyconfigurations/internal/internal.go +++ b/applyconfigurations/internal/internal.go @@ -7262,6 +7262,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: keyring type: scalar: string + default: /etc/ceph/keyring - name: monitors type: list: @@ -7271,6 +7272,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: pool type: scalar: string + default: rbd - name: readOnly type: scalar: boolean @@ -7280,6 +7282,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: user type: scalar: string + default: admin - name: io.k8s.api.core.v1.RBDVolumeSource map: fields: @@ -7293,6 +7296,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: keyring type: scalar: string + default: /etc/ceph/keyring - name: monitors type: list: @@ -7302,6 +7306,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: pool type: scalar: string + default: rbd - name: readOnly type: scalar: boolean @@ -7311,6 +7316,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: user type: scalar: string + default: admin - name: io.k8s.api.core.v1.ReplicationController map: fields: From 90902b591f823627ff0a3a1565b915dc1dde85e5 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 11:28:55 -0700 Subject: [PATCH 2/4] Use +default for now deprecated ISCSI volume Kubernetes-commit: 333c02cf28baa02a234b977f62a9a51f41c98572 --- applyconfigurations/internal/internal.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applyconfigurations/internal/internal.go b/applyconfigurations/internal/internal.go index f2235f31..416567b6 100644 --- a/applyconfigurations/internal/internal.go +++ b/applyconfigurations/internal/internal.go @@ -5702,6 +5702,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: iscsiInterface type: scalar: string + default: default - name: lun type: scalar: numeric @@ -5744,6 +5745,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: iscsiInterface type: scalar: string + default: default - name: lun type: scalar: numeric From f9b8f88e7db1dfcacc468c17611719480d1ff9a7 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 11:45:22 -0700 Subject: [PATCH 3/4] Use +default for now deprecated AzureDisk volume Kubernetes-commit: 0f5ab4beec4d05138ed3fff5a5b2a7e42bf75d0c --- applyconfigurations/internal/internal.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applyconfigurations/internal/internal.go b/applyconfigurations/internal/internal.go index 416567b6..b240df02 100644 --- a/applyconfigurations/internal/internal.go +++ b/applyconfigurations/internal/internal.go @@ -4454,6 +4454,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: cachingMode type: scalar: string + default: ReadWrite - name: diskName type: scalar: string @@ -4465,12 +4466,15 @@ var schemaYAML = typed.YAMLObject(`types: - name: fsType type: scalar: string + default: ext4 - name: kind type: scalar: string + default: Shared - name: readOnly type: scalar: boolean + default: false - name: io.k8s.api.core.v1.AzureFilePersistentVolumeSource map: fields: From af263053891a60885afb738068c519d507f98853 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 12:18:33 -0700 Subject: [PATCH 4/4] Use +default for now deprecated ScaleIO volume Kubernetes-commit: a074dd6f2e3ce394b767c109701045d13a56b6e2 --- applyconfigurations/internal/internal.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applyconfigurations/internal/internal.go b/applyconfigurations/internal/internal.go index b240df02..91783686 100644 --- a/applyconfigurations/internal/internal.go +++ b/applyconfigurations/internal/internal.go @@ -7523,6 +7523,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: fsType type: scalar: string + default: xfs - name: gateway type: scalar: string @@ -7542,6 +7543,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: storageMode type: scalar: string + default: ThinProvisioned - name: storagePool type: scalar: string @@ -7558,6 +7560,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: fsType type: scalar: string + default: xfs - name: gateway type: scalar: string @@ -7577,6 +7580,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: storageMode type: scalar: string + default: ThinProvisioned - name: storagePool type: scalar: string