rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-02 05:11:59 +00:00
Code Issues Releases Wiki Activity

Windows refactor

Browse Source 
- Don't need `RKEK8sWindowsSystemImage` anymore, Windows keeps its images as the same as `RKEK8sSystemImage` via Docker manifest.
- Add `PodInfraWindowsContainer` filed into `RKESystemImages`

**Issue:**
https://github.com/rancher/rancher/issues/16460
This commit is contained in:
Frank Mai 2019-07-05 10:26:36 +08:00 committed by Alena Prokharchyk
parent d8f2cacb8d
commit 719551e498
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apis/management.cattle.io/v3/rke_types.go
View File

@ -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"`

4
apis/management.cattle.io/v3/schema/schema.go
View File

@ -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 {