Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@ resources:
domain: ceph.io
group: csi
kind: Driver
path: github.com/ceph/ceph-csi-operator/api/v1alpha1
version: v1alpha1
path: github.com/ceph/ceph-csi-operator/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
domain: ceph.io
group: csi
kind: OperatorConfig
path: github.com/ceph/ceph-csi-operator/api/v1alpha1
version: v1alpha1
path: github.com/ceph/ceph-csi-operator/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: ceph.io
group: csi
kind: CephConnection
path: github.com/ceph/ceph-csi-operator/api/v1alpha1
version: v1alpha1
path: github.com/ceph/ceph-csi-operator/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
domain: ceph.io
group: csi
kind: ClientProfile
path: github.com/ceph/ceph-csi-operator/api/v1alpha1
version: v1alpha1
path: github.com/ceph/ceph-csi-operator/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: ceph.io
group: csi
kind: ClientProfileMapping
path: github.com/ceph/ceph-csi-operator/api/v1alpha1
version: v1alpha1
path: github.com/ceph/ceph-csi-operator/api/v1beta1
version: v1beta1
version: "3"
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
corev1 "k8s.io/api/core/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
appsv1 "k8s.io/api/apps/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1alpha1 contains API Schema definitions for the csi v1alpha1 API group
// Package v1beta1 contains API Schema definitions for the csi v1beta1 API group
// +kubebuilder:object:generate=true
// +groupName=csi.ceph.io
package v1alpha1
package v1beta1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -27,7 +27,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "csi.ceph.io", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "csi.ceph.io", Version: "v1beta1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

csiv1alpha1 "github.com/ceph/ceph-csi-operator/api/v1alpha1"
csiv1beta1 "github.com/ceph/ceph-csi-operator/api/v1beta1"
"github.com/ceph/ceph-csi-operator/internal/controller"
"github.com/ceph/ceph-csi-operator/internal/utils"
//+kubebuilder:scaffold:imports
Expand All @@ -53,7 +53,7 @@ var (
func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))

utilruntime.Must(csiv1alpha1.AddToScheme(scheme))
utilruntime.Must(csiv1beta1.AddToScheme(scheme))
//+kubebuilder:scaffold:scheme
}

Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csi.ceph.io_cephconnections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: cephconnection
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: CephConnection is the Schema for the cephconnections API
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csi.ceph.io_clientprofilemappings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: clientprofilemapping
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfileMapping is the Schema for the clientprofilemappings
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csi.ceph.io_clientprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: clientprofile
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfile is the Schema for the clientprofiles API
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csi.ceph.io_drivers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: driver
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: Driver is the Schema for the drivers API
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csi.ceph.io_operatorconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: operatorconfig
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: OperatorConfig is the Schema for the operatorconfigs API
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
kind: CephConnection
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
kind: ClientProfile
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
kind: ClientProfileMapping
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
kind: Driver
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
kind: OperatorConfig
metadata:
labels:
Expand Down
10 changes: 5 additions & 5 deletions config/samples/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Append samples of your project ##
resources:
- csi_v1alpha1_driver.yaml
- csi_v1alpha1_operatorconfig.yaml
- csi_v1alpha1_cephconnection.yaml
- csi_v1alpha1_clientprofile.yaml
- csi_v1alpha1_clientprofilemapping.yaml
- csi_v1beta1_driver.yaml
- csi_v1beta1_operatorconfig.yaml
- csi_v1beta1_cephconnection.yaml
- csi_v1beta1_clientprofile.yaml
- csi_v1beta1_clientprofilemapping.yaml
#+kubebuilder:scaffold:manifestskustomizesamples
10 changes: 5 additions & 5 deletions deploy/all-in-one/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
singular: cephconnection
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: CephConnection is the Schema for the cephconnections API
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
singular: clientprofilemapping
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfileMapping is the Schema for the clientprofilemappings
Expand Down Expand Up @@ -162,7 +162,7 @@ spec:
singular: clientprofile
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfile is the Schema for the clientprofiles API
Expand Down Expand Up @@ -264,7 +264,7 @@ spec:
singular: driver
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: Driver is the Schema for the drivers API
Expand Down Expand Up @@ -7119,7 +7119,7 @@ spec:
singular: operatorconfig
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: OperatorConfig is the Schema for the operatorconfigs API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
singular: cephconnection
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: CephConnection is the Schema for the cephconnections API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
singular: clientprofile
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfile is the Schema for the clientprofiles API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
singular: clientprofilemapping
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfileMapping is the Schema for the clientprofilemappings
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/ceph-csi-operator/templates/driver-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
singular: driver
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: Driver is the Schema for the drivers API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
singular: operatorconfig
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: OperatorConfig is the Schema for the operatorconfigs API
Expand Down
10 changes: 5 additions & 5 deletions deploy/multifile/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: cephconnection
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: CephConnection is the Schema for the cephconnections API
Expand Down Expand Up @@ -82,7 +82,7 @@ spec:
singular: clientprofilemapping
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfileMapping is the Schema for the clientprofilemappings
Expand Down Expand Up @@ -153,7 +153,7 @@ spec:
singular: clientprofile
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: ClientProfile is the Schema for the clientprofiles API
Expand Down Expand Up @@ -255,7 +255,7 @@ spec:
singular: driver
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: Driver is the Schema for the drivers API
Expand Down Expand Up @@ -7110,7 +7110,7 @@ spec:
singular: operatorconfig
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
description: OperatorConfig is the Schema for the operatorconfigs API
Expand Down
4 changes: 2 additions & 2 deletions docs/design/hostNetwork.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Example:

```yaml
kind: OperatorConfig
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
metadata:
name: ceph-csi-operator-config
namespace: <operator-namespace>
Expand All @@ -34,7 +34,7 @@ spec:
## Driver CR

```yaml
apiVersion: csi.ceph.io/v1alpha1
apiVersion: csi.ceph.io/v1beta1
kind: Driver
metadata:
name: rbd.csi.ceph.com
Expand Down
Loading
Loading