diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index d0e16984..22b3324c 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -146,6 +146,8 @@ type RKESystemImages struct { IngressBackend string `yaml:"ingress_backend" json:"ingressBackend,omitempty"` // Metrics Server image MetricsServer string `yaml:"metrics_server" json:"metricsServer,omitempty"` + // Pod infra container image for Windows + WindowsPodInfraContainer string `yaml:"windows_pod_infra_container" json:"podInfraWindowsContainer,omitempty"` } type RKEConfigNode struct { @@ -205,14 +207,6 @@ type RKEAddon struct { Template string `yaml:"template" json:"template,omitempty"` } -type RKEK8sWindowsSystemImage struct { - types.Namespaced - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - SystemImages WindowsSystemImages `yaml:"windows_system_images" json:"windowsSystemImages,omitempty"` -} - type K8sVersionInfo struct { MinRKEVersion string `yaml:"min_rke_version" json:"minRKEVersion,omitempty"` MaxRKEVersion string `yaml:"max_rke_version" json:"maxRKEVersion,omitempty"` diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 5128383e..0a220eb6 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -95,11 +95,9 @@ func driverMetadataTypes(schemas *types.Schemas) *types.Schemas { AddMapperForType(&Version, v3.RKEK8sSystemImage{}, m.Drop{Field: "namespaceId"}). AddMapperForType(&Version, v3.RKEK8sServiceOption{}, m.Drop{Field: "namespaceId"}). AddMapperForType(&Version, v3.RKEAddon{}, m.Drop{Field: "namespaceId"}). - AddMapperForType(&Version, v3.RKEK8sWindowsSystemImage{}, m.Drop{Field: "namespaceId"}). MustImport(&Version, v3.RKEK8sSystemImage{}). MustImport(&Version, v3.RKEK8sServiceOption{}). - MustImport(&Version, v3.RKEAddon{}). - MustImport(&Version, v3.RKEK8sWindowsSystemImage{}) + MustImport(&Version, v3.RKEAddon{}) } func catalogTypes(schemas *types.Schemas) *types.Schemas {