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

Coreos satellite cluster #8

Merged
merged 3 commits into from
Sep 5, 2022
Merged

Coreos satellite cluster #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cedf19
add operatingSystem field for sat cluster create remote create and wo…
Aug 19, 2022
acb7b3d
create operatingSystem setter for for sat cluster create remote creat…
Aug 19, 2022
29a124d
added operatingSystem field to tests for cluster create remote create…
Aug 19, 2022
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
38 changes: 37 additions & 1 deletion kubernetesserviceapiv1/kubernetes_service_api_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9739,6 +9739,9 @@ func (kubernetesServiceApi *KubernetesServiceApiV1) CreateSatelliteClusterWithCo
if createSatelliteClusterOptions.Name != nil {
body["name"] = createSatelliteClusterOptions.Name
}
if createSatelliteClusterOptions.OperatingSystem != nil {
body["operatingSystem"] = createSatelliteClusterOptions.OperatingSystem
}
if createSatelliteClusterOptions.PodSubnet != nil {
body["podSubnet"] = createSatelliteClusterOptions.PodSubnet
}
Expand Down Expand Up @@ -9848,6 +9851,9 @@ func (kubernetesServiceApi *KubernetesServiceApiV1) CreateSatelliteWorkerPoolWit
if createSatelliteWorkerPoolOptions.Name != nil {
body["name"] = createSatelliteWorkerPoolOptions.Name
}
if createSatelliteWorkerPoolOptions.OperatingSystem != nil {
body["operatingSystem"] = createSatelliteWorkerPoolOptions.OperatingSystem
}
if createSatelliteWorkerPoolOptions.WorkerCount != nil {
body["workerCount"] = createSatelliteWorkerPoolOptions.WorkerCount
}
Expand Down Expand Up @@ -10656,6 +10662,9 @@ func (kubernetesServiceApi *KubernetesServiceApiV1) CreateSatelliteClusterRemote
if createSatelliteClusterRemoteOptions.Name != nil {
body["name"] = createSatelliteClusterRemoteOptions.Name
}
if createSatelliteClusterRemoteOptions.OperatingSystem != nil {
body["operatingSystem"] = createSatelliteClusterRemoteOptions.OperatingSystem
}
if createSatelliteClusterRemoteOptions.PodSubnet != nil {
body["podSubnet"] = createSatelliteClusterRemoteOptions.PodSubnet
}
Expand Down Expand Up @@ -16920,7 +16929,7 @@ type AttachSatelliteHostOptions struct {
// Key-value pairs to label the host, such as cpu=4 to describe the host capabilities.
Labels map[string]string

//The operating system of the hosts to attach to the location. Options are RHEL or RHCOS
//Optional: The operating system of the hosts to attach to the location. Options are RHEL or RHCOS
OperatingSystem *string

// The ID of the resource group that the Satellite location is in. To list the resource group ID of the location, use
Expand Down Expand Up @@ -20112,6 +20121,9 @@ type CreateSatelliteClusterOptions struct {
// The unique name for the new IBM Cloud Satellite cluster.
Name *string

//Optional: The operating system of the hosts to add to the cluster. Options are RHEL7, RHEL8, or RHCOS.
OperatingSystem *string

// Optional: User provided value for the pod subnet.
PodSubnet *string

Expand Down Expand Up @@ -20170,6 +20182,12 @@ func (options *CreateSatelliteClusterOptions) SetName(name string) *CreateSatell
return options
}

// SetOperatingSystem : Allow user to set OperatingSystem
func (options *CreateSatelliteClusterOptions) SetOperatingSystem(operatingSystem string) *CreateSatelliteClusterOptions {
options.OperatingSystem = core.StringPtr(operatingSystem)
return options
}

// SetPodSubnet : Allow user to set PodSubnet
func (options *CreateSatelliteClusterOptions) SetPodSubnet(podSubnet string) *CreateSatelliteClusterOptions {
options.PodSubnet = core.StringPtr(podSubnet)
Expand Down Expand Up @@ -20235,6 +20253,9 @@ type CreateSatelliteClusterRemoteOptions struct {
// The unique name for the new IBM Cloud Satellite cluster.
Name *string

//Optional: The operating system of the hosts to add to the cluster. Options are RHEL7, RHEL8, or RHCOS.
OperatingSystem *string

// Optional: User provided value for the pod subnet.
PodSubnet *string

Expand Down Expand Up @@ -20301,6 +20322,12 @@ func (options *CreateSatelliteClusterRemoteOptions) SetName(name string) *Create
return options
}

// SetOperatingSystem : Allow user to set OperatingSystem
func (options *CreateSatelliteClusterRemoteOptions) SetOperatingSystem(operatingSystem string) *CreateSatelliteClusterRemoteOptions {
options.OperatingSystem = core.StringPtr(operatingSystem)
return options
}

// SetPodSubnet : Allow user to set PodSubnet
func (options *CreateSatelliteClusterRemoteOptions) SetPodSubnet(podSubnet string) *CreateSatelliteClusterRemoteOptions {
options.PodSubnet = core.StringPtr(podSubnet)
Expand Down Expand Up @@ -20471,6 +20498,9 @@ type CreateSatelliteWorkerPoolOptions struct {

Name *string

//Optional: The operating system of the hosts in the worker pool. Options are RHEL7, RHEL8, or RHCOS.
OperatingSystem *string

WorkerCount *int64

// The ID of the resource group that the Satellite location is in. To list the resource group ID of the location, use
Expand Down Expand Up @@ -20540,6 +20570,12 @@ func (options *CreateSatelliteWorkerPoolOptions) SetName(name string) *CreateSat
return options
}

// SetOperatingSystem : Allow user to set OperatingSystem
func (options *CreateSatelliteWorkerPoolOptions) SetOperatingSystem(operatingSystem string) *CreateSatelliteWorkerPoolOptions {
options.OperatingSystem = core.StringPtr(operatingSystem)
return options
}

// SetWorkerCount : Allow user to set WorkerCount
func (options *CreateSatelliteWorkerPoolOptions) SetWorkerCount(workerCount int64) *CreateSatelliteWorkerPoolOptions {
options.WorkerCount = core.Int64Ptr(workerCount)
Expand Down
18 changes: 18 additions & 0 deletions kubernetesserviceapiv1/kubernetes_service_api_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23423,6 +23423,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterOptionsModel.Labels = make(map[string]string)
createSatelliteClusterOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -23503,6 +23504,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterOptionsModel.Labels = make(map[string]string)
createSatelliteClusterOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -23590,6 +23592,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterOptionsModel.Labels = make(map[string]string)
createSatelliteClusterOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -23620,6 +23623,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterOptionsModel.Labels = make(map[string]string)
createSatelliteClusterOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -23681,6 +23685,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteWorkerPoolOptionsModel.Isolation = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Labels = make(map[string]string)
createSatelliteWorkerPoolOptionsModel.Name = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteWorkerPoolOptionsModel.WorkerCount = core.Int64Ptr(int64(26))
createSatelliteWorkerPoolOptionsModel.XAuthResourceGroup = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"}
Expand Down Expand Up @@ -23765,6 +23770,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteWorkerPoolOptionsModel.Isolation = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Labels = make(map[string]string)
createSatelliteWorkerPoolOptionsModel.Name = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteWorkerPoolOptionsModel.WorkerCount = core.Int64Ptr(int64(26))
createSatelliteWorkerPoolOptionsModel.XAuthResourceGroup = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"}
Expand Down Expand Up @@ -23856,6 +23862,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteWorkerPoolOptionsModel.Isolation = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Labels = make(map[string]string)
createSatelliteWorkerPoolOptionsModel.Name = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteWorkerPoolOptionsModel.WorkerCount = core.Int64Ptr(int64(26))
createSatelliteWorkerPoolOptionsModel.XAuthResourceGroup = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"}
Expand Down Expand Up @@ -23890,6 +23897,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteWorkerPoolOptionsModel.Isolation = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Labels = make(map[string]string)
createSatelliteWorkerPoolOptionsModel.Name = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteWorkerPoolOptionsModel.WorkerCount = core.Int64Ptr(int64(26))
createSatelliteWorkerPoolOptionsModel.XAuthResourceGroup = core.StringPtr("testString")
createSatelliteWorkerPoolOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"}
Expand Down Expand Up @@ -26052,6 +26060,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterRemoteOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.Labels = make(map[string]string)
createSatelliteClusterRemoteOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterRemoteOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -26135,6 +26144,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterRemoteOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.Labels = make(map[string]string)
createSatelliteClusterRemoteOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterRemoteOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -26225,6 +26235,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterRemoteOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.Labels = make(map[string]string)
createSatelliteClusterRemoteOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterRemoteOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -26256,6 +26267,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterRemoteOptionsModel.KubeVersion = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.Labels = make(map[string]string)
createSatelliteClusterRemoteOptionsModel.Name = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.OperatingSystem = core.StringPtr("RHCOS")
createSatelliteClusterRemoteOptionsModel.PodSubnet = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.PullSecret = core.StringPtr("testString")
createSatelliteClusterRemoteOptionsModel.ServiceSubnet = core.StringPtr("testString")
Expand Down Expand Up @@ -41065,6 +41077,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterOptionsModel.SetKubeVersion("testString")
createSatelliteClusterOptionsModel.SetLabels(make(map[string]string))
createSatelliteClusterOptionsModel.SetName("testString")
createSatelliteClusterOptionsModel.SetOperatingSystem("RHCOS")
createSatelliteClusterOptionsModel.SetPodSubnet("testString")
createSatelliteClusterOptionsModel.SetPullSecret("testString")
createSatelliteClusterOptionsModel.SetServiceSubnet("testString")
Expand All @@ -41078,6 +41091,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
Expect(createSatelliteClusterOptionsModel.KubeVersion).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterOptionsModel.Labels).To(Equal(make(map[string]string)))
Expect(createSatelliteClusterOptionsModel.Name).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterOptionsModel.OperatingSystem).To(Equal(core.StringPtr("RHCOS")))
Expect(createSatelliteClusterOptionsModel.PodSubnet).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterOptionsModel.PullSecret).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterOptionsModel.ServiceSubnet).To(Equal(core.StringPtr("testString")))
Expand All @@ -41096,6 +41110,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteClusterRemoteOptionsModel.SetKubeVersion("testString")
createSatelliteClusterRemoteOptionsModel.SetLabels(make(map[string]string))
createSatelliteClusterRemoteOptionsModel.SetName("testString")
createSatelliteClusterRemoteOptionsModel.SetOperatingSystem("RHCOS")
createSatelliteClusterRemoteOptionsModel.SetPodSubnet("testString")
createSatelliteClusterRemoteOptionsModel.SetPullSecret("testString")
createSatelliteClusterRemoteOptionsModel.SetServiceSubnet("testString")
Expand All @@ -41110,6 +41125,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
Expect(createSatelliteClusterRemoteOptionsModel.KubeVersion).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterRemoteOptionsModel.Labels).To(Equal(make(map[string]string)))
Expect(createSatelliteClusterRemoteOptionsModel.Name).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterRemoteOptionsModel.OperatingSystem).To(Equal(core.StringPtr("RHCOS")))
Expect(createSatelliteClusterRemoteOptionsModel.PodSubnet).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterRemoteOptionsModel.PullSecret).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteClusterRemoteOptionsModel.ServiceSubnet).To(Equal(core.StringPtr("testString")))
Expand Down Expand Up @@ -41197,6 +41213,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
createSatelliteWorkerPoolOptionsModel.SetIsolation("testString")
createSatelliteWorkerPoolOptionsModel.SetLabels(make(map[string]string))
createSatelliteWorkerPoolOptionsModel.SetName("testString")
createSatelliteWorkerPoolOptionsModel.SetOperatingSystem("RHCOS")
createSatelliteWorkerPoolOptionsModel.SetWorkerCount(int64(26))
createSatelliteWorkerPoolOptionsModel.SetXAuthResourceGroup("testString")
createSatelliteWorkerPoolOptionsModel.SetHeaders(map[string]string{"foo": "bar"})
Expand All @@ -41210,6 +41227,7 @@ var _ = Describe(`KubernetesServiceApiV1`, func() {
Expect(createSatelliteWorkerPoolOptionsModel.Isolation).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteWorkerPoolOptionsModel.Labels).To(Equal(make(map[string]string)))
Expect(createSatelliteWorkerPoolOptionsModel.Name).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteWorkerPoolOptionsModel.OperatingSystem).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteWorkerPoolOptionsModel.WorkerCount).To(Equal(core.Int64Ptr(int64(26))))
Expect(createSatelliteWorkerPoolOptionsModel.XAuthResourceGroup).To(Equal(core.StringPtr("testString")))
Expect(createSatelliteWorkerPoolOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"}))
Expand Down