diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 34425e87..5de7297d 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -158,8 +158,10 @@ func nativeNodeTypes(schemas *types.Schemas) *types.Schemas { &m.Drop{Field: "configSource"}, &m.Move{From: "providerID", To: "providerId"}, &m.Move{From: "podCIDR", To: "podCidr"}, + &m.Move{From: "podCIDRs", To: "podCidrs"}, m.Access{Fields: map[string]string{ "podCidr": "r", + "podCidrs": "r", "providerId": "r", "taints": "ru", "unschedulable": "ru", diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go index 1a2a3783..2c7f7d35 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/apis/project.cattle.io/v3/schema/schema.go @@ -3,7 +3,7 @@ package schema import ( "net/http" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" @@ -944,11 +944,6 @@ func pipelineTypes(schema *types.Schemas) *types.Schemas { func monitoringTypes(schemas *types.Schemas) *types.Schemas { return schemas. - AddMapperForType(&Version, monitoringv1.StorageSpec{}, - &m.Drop{Field: "class"}, - &m.Drop{Field: "selector"}, - &m.Drop{Field: "resources"}, - ). AddMapperForType(&Version, monitoringv1.Prometheus{}, &m.Drop{Field: "status"}, &m.AnnotationField{Field: "description"}, diff --git a/main.go b/main.go index 754dcf58..bd183491 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,8 @@ package main import ( - monitoringv1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + monitoring "github.com/coreos/prometheus-operator/pkg/apis/monitoring" + monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" clusterSchema "github.com/rancher/types/apis/cluster.cattle.io/v3/schema" managementSchema "github.com/rancher/types/apis/management.cattle.io/v3/schema" @@ -95,7 +96,7 @@ func main() { }, ) generator.GenerateNativeTypes( - k8sschema.GroupVersion{Group: monitoringv1.Group, Version: monitoringv1.Version}, + k8sschema.GroupVersion{Group: monitoring.GroupName, Version: monitoringv1.Version}, []interface{}{ monitoringv1.Prometheus{}, monitoringv1.Alertmanager{},