mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
deploy: move cephfs/csidriver to API
Signed-off-by: riya-singhal31 <rsinghal@redhat.com>
This commit is contained in:
parent
802df8f69b
commit
54fa028465
@ -1,3 +1,4 @@
|
|||||||
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
|
74
api/deploy/kubernetes/cephfs/csidriver.go
Normal file
74
api/deploy/kubernetes/cephfs/csidriver.go
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2023 The Ceph-CSI Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package cephfs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
_ "embed"
|
||||||
|
"fmt"
|
||||||
|
"text/template"
|
||||||
|
|
||||||
|
"github.com/ghodss/yaml"
|
||||||
|
storagev1 "k8s.io/api/storage/v1"
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:embed csidriver.yaml
|
||||||
|
var csiDriver string
|
||||||
|
|
||||||
|
type CSIDriverValues struct {
|
||||||
|
Name string
|
||||||
|
}
|
||||||
|
|
||||||
|
var CSIDriverDefaults = CSIDriverValues{
|
||||||
|
Name: "cephfs.csi.ceph.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewCSIDriver takes a driver name from the CSIDriverValues struct and
|
||||||
|
// replaces the value in the template. A CSIDriver object is returned which can
|
||||||
|
// be created in the Kubernetes cluster.
|
||||||
|
func NewCSIDriver(values CSIDriverValues) (*storagev1.CSIDriver, error) {
|
||||||
|
data, err := NewCSIDriverYAML(values)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
driver := &storagev1.CSIDriver{}
|
||||||
|
err = yaml.Unmarshal([]byte(data), driver)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed convert YAML to %T: %w", driver, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return driver, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewCSIDriverYAML takes a driver name from the CSIDriverValues struct and
|
||||||
|
// replaces the value in the template. A CSIDriver object in YAML is returned
|
||||||
|
// which can be created in the Kubernetes cluster.
|
||||||
|
func NewCSIDriverYAML(values CSIDriverValues) (string, error) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
tmpl, err := template.New("CSIDriver").Parse(csiDriver)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to parse template: %w", err)
|
||||||
|
}
|
||||||
|
err = tmpl.Execute(&buf, values)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to replace values in template: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf.String(), nil
|
||||||
|
}
|
9
api/deploy/kubernetes/cephfs/csidriver.yaml
Normal file
9
api/deploy/kubernetes/cephfs/csidriver.yaml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
apiVersion: storage.k8s.io/v1
|
||||||
|
kind: CSIDriver
|
||||||
|
metadata:
|
||||||
|
name: "{{ .Name }}"
|
||||||
|
spec:
|
||||||
|
attachRequired: false
|
||||||
|
podInfoOnMount: false
|
||||||
|
fsGroupPolicy: File
|
38
api/deploy/kubernetes/cephfs/csidriver_test.go
Normal file
38
api/deploy/kubernetes/cephfs/csidriver_test.go
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2023 The Ceph-CSI Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package cephfs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestNewCSIDriver(t *testing.T) {
|
||||||
|
driver, err := NewCSIDriver(CSIDriverDefaults)
|
||||||
|
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.NotNil(t, driver)
|
||||||
|
require.Equal(t, driver.Name, CSIDriverDefaults.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewCSIDriverYAML(t *testing.T) {
|
||||||
|
yaml, err := NewCSIDriverYAML(CSIDriverDefaults)
|
||||||
|
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.NotEqual(t, "", yaml)
|
||||||
|
}
|
@ -25,6 +25,9 @@ all: \
|
|||||||
scc.yaml: ../api/deploy/ocp/scc.yaml ../api/deploy/ocp/scc.go
|
scc.yaml: ../api/deploy/ocp/scc.yaml ../api/deploy/ocp/scc.go
|
||||||
$(MAKE) -C ../tools generate-deploy
|
$(MAKE) -C ../tools generate-deploy
|
||||||
|
|
||||||
|
cephfs/kubernetes/csidriver.yaml: ../api/deploy/kubernetes/cephfs/csidriver.yaml ../api/deploy/kubernetes/cephfs/csidriver.go
|
||||||
|
$(MAKE) -C ../tools generate-deploy
|
||||||
|
|
||||||
cephfs/kubernetes/csi-config-map.yaml: ../api/deploy/kubernetes/cephfs/csi-config-map.*
|
cephfs/kubernetes/csi-config-map.yaml: ../api/deploy/kubernetes/cephfs/csi-config-map.*
|
||||||
$(MAKE) -C ../tools generate-deploy
|
$(MAKE) -C ../tools generate-deploy
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
# The source for the contents can be found in the api/deploy directory, make
|
# The source for the contents can be found in the api/deploy directory, make
|
||||||
# your modifications there.
|
# your modifications there.
|
||||||
#
|
#
|
||||||
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -1,8 +1,15 @@
|
|||||||
|
#
|
||||||
|
# /!\ DO NOT MODIFY THIS FILE
|
||||||
|
#
|
||||||
|
# This file has been automatically generated by Ceph-CSI yamlgen.
|
||||||
|
# The source for the contents can be found in the api/deploy directory, make
|
||||||
|
# your modifications there.
|
||||||
|
#
|
||||||
---
|
---
|
||||||
apiVersion: storage.k8s.io/v1
|
apiVersion: storage.k8s.io/v1
|
||||||
kind: CSIDriver
|
kind: CSIDriver
|
||||||
metadata:
|
metadata:
|
||||||
name: cephfs.csi.ceph.com
|
name: "cephfs.csi.ceph.com"
|
||||||
spec:
|
spec:
|
||||||
attachRequired: false
|
attachRequired: false
|
||||||
podInfoOnMount: false
|
podInfoOnMount: false
|
||||||
|
@ -49,6 +49,11 @@ var yamlArtifacts = []deploymentArtifact{
|
|||||||
reflect.ValueOf(ocp.NewSecurityContextConstraintsYAML),
|
reflect.ValueOf(ocp.NewSecurityContextConstraintsYAML),
|
||||||
reflect.ValueOf(ocp.SecurityContextConstraintsDefaults),
|
reflect.ValueOf(ocp.SecurityContextConstraintsDefaults),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"../deploy/cephfs/kubernetes/csidriver.yaml",
|
||||||
|
reflect.ValueOf(cephfs.NewCSIDriverYAML),
|
||||||
|
reflect.ValueOf(cephfs.CSIDriverDefaults),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"../deploy/cephfs/kubernetes/csi-config-map.yaml",
|
"../deploy/cephfs/kubernetes/csi-config-map.yaml",
|
||||||
reflect.ValueOf(cephfs.NewCSIConfigMapYAML),
|
reflect.ValueOf(cephfs.NewCSIConfigMapYAML),
|
||||||
|
1
vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs/csi-config-map.yaml
generated
vendored
1
vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs/csi-config-map.yaml
generated
vendored
@ -1,3 +1,4 @@
|
|||||||
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
|
74
vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs/csidriver.go
generated
vendored
Normal file
74
vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs/csidriver.go
generated
vendored
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2023 The Ceph-CSI Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package cephfs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
_ "embed"
|
||||||
|
"fmt"
|
||||||
|
"text/template"
|
||||||
|
|
||||||
|
"github.com/ghodss/yaml"
|
||||||
|
storagev1 "k8s.io/api/storage/v1"
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:embed csidriver.yaml
|
||||||
|
var csiDriver string
|
||||||
|
|
||||||
|
type CSIDriverValues struct {
|
||||||
|
Name string
|
||||||
|
}
|
||||||
|
|
||||||
|
var CSIDriverDefaults = CSIDriverValues{
|
||||||
|
Name: "cephfs.csi.ceph.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewCSIDriver takes a driver name from the CSIDriverValues struct and
|
||||||
|
// replaces the value in the template. A CSIDriver object is returned which can
|
||||||
|
// be created in the Kubernetes cluster.
|
||||||
|
func NewCSIDriver(values CSIDriverValues) (*storagev1.CSIDriver, error) {
|
||||||
|
data, err := NewCSIDriverYAML(values)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
driver := &storagev1.CSIDriver{}
|
||||||
|
err = yaml.Unmarshal([]byte(data), driver)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed convert YAML to %T: %w", driver, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return driver, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewCSIDriverYAML takes a driver name from the CSIDriverValues struct and
|
||||||
|
// replaces the value in the template. A CSIDriver object in YAML is returned
|
||||||
|
// which can be created in the Kubernetes cluster.
|
||||||
|
func NewCSIDriverYAML(values CSIDriverValues) (string, error) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
tmpl, err := template.New("CSIDriver").Parse(csiDriver)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to parse template: %w", err)
|
||||||
|
}
|
||||||
|
err = tmpl.Execute(&buf, values)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to replace values in template: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf.String(), nil
|
||||||
|
}
|
9
vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs/csidriver.yaml
generated
vendored
Normal file
9
vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs/csidriver.yaml
generated
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
apiVersion: storage.k8s.io/v1
|
||||||
|
kind: CSIDriver
|
||||||
|
metadata:
|
||||||
|
name: "{{ .Name }}"
|
||||||
|
spec:
|
||||||
|
attachRequired: false
|
||||||
|
podInfoOnMount: false
|
||||||
|
fsGroupPolicy: File
|
1
vendor/modules.txt
vendored
1
vendor/modules.txt
vendored
@ -119,6 +119,7 @@ github.com/cenkalti/backoff/v3
|
|||||||
github.com/cenkalti/backoff/v4
|
github.com/cenkalti/backoff/v4
|
||||||
# github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 => ./api
|
# github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 => ./api
|
||||||
## explicit; go 1.18
|
## explicit; go 1.18
|
||||||
|
github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs
|
||||||
github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs
|
github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs
|
||||||
github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd
|
github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd
|
||||||
github.com/ceph/ceph-csi/api/deploy/ocp
|
github.com/ceph/ceph-csi/api/deploy/ocp
|
||||||
|
Loading…
Reference in New Issue
Block a user