Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Switch to type aliasing #372

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: Switch to type aliasing #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions config/openshift/v4_10/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
13 changes: 3 additions & 10 deletions config/openshift/v4_11/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
13 changes: 3 additions & 10 deletions config/openshift/v4_12_exp/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
14 changes: 3 additions & 11 deletions config/openshift/v4_9/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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