From 0e2db678caf093b376e1a3f32f067df16992706b Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Fri, 15 Jul 2022 16:32:45 -0400 Subject: [PATCH] openshift to type aliasing --- config/openshift/v4_10/schema.go | 13 +++---------- config/openshift/v4_11/schema.go | 13 +++---------- config/openshift/v4_12_exp/schema.go | 13 +++---------- config/openshift/v4_9/schema.go | 14 +++----------- 4 files changed, 12 insertions(+), 41 deletions(-) diff --git a/config/openshift/v4_10/schema.go b/config/openshift/v4_10/schema.go index 6d6e0ce5..864d6fb3 100644 --- a/config/openshift/v4_10/schema.go +++ b/config/openshift/v4_10/schema.go @@ -16,6 +16,7 @@ package v4_10 import ( fcos "github.com/coreos/butane/config/fcos/v1_3" + "github.com/coreos/butane/config/openshift/v4_8" ) const ROLE_LABEL_KEY = "machineconfiguration.openshift.io/role" @@ -26,14 +27,6 @@ type Config struct { OpenShift OpenShift `yaml:"openshift"` } -type Metadata struct { - Name string `yaml:"name"` - Labels map[string]string `yaml:"labels,omitempty"` -} +type Metadata v4_8.Metadata -type OpenShift struct { - KernelArguments []string `yaml:"kernel_arguments"` - Extensions []string `yaml:"extensions"` - FIPS *bool `yaml:"fips"` - KernelType *string `yaml:"kernel_type"` -} +type OpenShift v4_8.OpenShift diff --git a/config/openshift/v4_11/schema.go b/config/openshift/v4_11/schema.go index eac0a311..e932fbf4 100644 --- a/config/openshift/v4_11/schema.go +++ b/config/openshift/v4_11/schema.go @@ -16,6 +16,7 @@ package v4_11 import ( fcos "github.com/coreos/butane/config/fcos/v1_3" + "github.com/coreos/butane/config/openshift/v4_8" ) const ROLE_LABEL_KEY = "machineconfiguration.openshift.io/role" @@ -26,14 +27,6 @@ type Config struct { OpenShift OpenShift `yaml:"openshift"` } -type Metadata struct { - Name string `yaml:"name"` - Labels map[string]string `yaml:"labels,omitempty"` -} +type Metadata v4_8.Metadata -type OpenShift struct { - KernelArguments []string `yaml:"kernel_arguments"` - Extensions []string `yaml:"extensions"` - FIPS *bool `yaml:"fips"` - KernelType *string `yaml:"kernel_type"` -} +type OpenShift v4_8.OpenShift diff --git a/config/openshift/v4_12_exp/schema.go b/config/openshift/v4_12_exp/schema.go index 518871d3..abc6236b 100644 --- a/config/openshift/v4_12_exp/schema.go +++ b/config/openshift/v4_12_exp/schema.go @@ -16,6 +16,7 @@ package v4_12_exp import ( fcos "github.com/coreos/butane/config/fcos/v1_5_exp" + "github.com/coreos/butane/config/openshift/v4_8" ) const ROLE_LABEL_KEY = "machineconfiguration.openshift.io/role" @@ -26,14 +27,6 @@ type Config struct { OpenShift OpenShift `yaml:"openshift"` } -type Metadata struct { - Name string `yaml:"name"` - Labels map[string]string `yaml:"labels,omitempty"` -} +type Metadata v4_8.Metadata -type OpenShift struct { - KernelArguments []string `yaml:"kernel_arguments"` - Extensions []string `yaml:"extensions"` - FIPS *bool `yaml:"fips"` - KernelType *string `yaml:"kernel_type"` -} +type OpenShift v4_8.OpenShift diff --git a/config/openshift/v4_9/schema.go b/config/openshift/v4_9/schema.go index 1953040a..d64bc97e 100644 --- a/config/openshift/v4_9/schema.go +++ b/config/openshift/v4_9/schema.go @@ -16,6 +16,7 @@ package v4_9 import ( fcos "github.com/coreos/butane/config/fcos/v1_3" + "github.com/coreos/butane/config/openshift/v4_8" ) const ROLE_LABEL_KEY = "machineconfiguration.openshift.io/role" @@ -25,15 +26,6 @@ type Config struct { Metadata Metadata `yaml:"metadata"` OpenShift OpenShift `yaml:"openshift"` } +type Metadata v4_8.Metadata -type Metadata struct { - Name string `yaml:"name"` - Labels map[string]string `yaml:"labels,omitempty"` -} - -type OpenShift struct { - KernelArguments []string `yaml:"kernel_arguments"` - Extensions []string `yaml:"extensions"` - FIPS *bool `yaml:"fips"` - KernelType *string `yaml:"kernel_type"` -} +type OpenShift v4_8.OpenShift