Skip to content
Merged
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
2 changes: 1 addition & 1 deletion crds/operators.coreos.com_operators.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
singular: operator
scope: Cluster
versions:
- name: v2alpha1
- name: v1
schema:
openAPIV3Schema:
description: Operator represents a cluster operator.
Expand Down
14 changes: 7 additions & 7 deletions crds/zz_defs.go

Large diffs are not rendered by default.

16 changes: 7 additions & 9 deletions pkg/operators/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"

"github.com/operator-framework/api/pkg/operators"
v1 "github.com/operator-framework/api/pkg/operators/v1"
"github.com/operator-framework/api/pkg/operators/v1alpha1"
"github.com/operator-framework/api/pkg/operators/v1alpha2"
"github.com/operator-framework/api/pkg/operators/v2alpha1"
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
operatorsv1alpha2 "github.com/operator-framework/api/pkg/operators/v1alpha2"
)

// Install registers the API group and adds all of its types to the given scheme.
func Install(scheme *runtime.Scheme) {
utilruntime.Must(operators.AddToScheme(scheme))
utilruntime.Must(v1alpha1.AddToScheme(scheme))
utilruntime.Must(v1alpha2.AddToScheme(scheme))
utilruntime.Must(v1.AddToScheme(scheme))
utilruntime.Must(v2alpha1.AddToScheme(scheme))
utilruntime.Must(scheme.SetVersionPriority(v2alpha1.GroupVersion, v1.SchemeGroupVersion, v1alpha2.GroupVersion, v1alpha1.SchemeGroupVersion))
utilruntime.Must(operatorsv1alpha1.AddToScheme(scheme))
utilruntime.Must(operatorsv1alpha2.AddToScheme(scheme))
utilruntime.Must(operatorsv1.AddToScheme(scheme))
utilruntime.Must(scheme.SetVersionPriority(operatorsv1.GroupVersion, operatorsv1alpha2.GroupVersion, operatorsv1alpha1.SchemeGroupVersion))
}
6 changes: 0 additions & 6 deletions pkg/operators/v1/doc.go

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
/*
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 v2alpha1 contains API Schema definitions for the discovery v2alpha1 API group.
// Package v1 contains API Schema definitions for the operator v1 API group.
// +kubebuilder:object:generate=true
// +groupName=operators.coreos.com
package v2alpha1
package v1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -24,7 +10,7 @@ import (

var (
// GroupVersion is group version used to register these objects.
GroupVersion = schema.GroupVersion{Group: "operators.coreos.com", Version: "v2alpha1"}
GroupVersion = schema.GroupVersion{Group: "operators.coreos.com", Version: "v1"}

// SchemeGroupVersion is required for compatibility with client generation.
SchemeGroupVersion = GroupVersion
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*

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 v2alpha1
package v1

import (
corev1 "k8s.io/api/core/v1"
Expand Down
4 changes: 4 additions & 0 deletions pkg/operators/v1/operatorgroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,7 @@ func (o *OperatorGroup) NamespaceLabelSelector() (*metav1.LabelSelector, error)
func IsOperatorGroupLabel(label string) bool {
return strings.HasPrefix(label, OperatorGroupLabelPrefix)
}

func init() {
SchemeBuilder.Register(&OperatorGroup{}, &OperatorGroupList{})
}
49 changes: 0 additions & 49 deletions pkg/operators/v1/register.go

This file was deleted.

185 changes: 0 additions & 185 deletions pkg/operators/v1/zz_generated.conversion.go

This file was deleted.

Loading