Skip to content

Rename ClusterName to ClusterID #103

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

Closed
spangenberg wants to merge 1 commit into from
Closed

Rename ClusterName to ClusterID #103

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
1 change: 0 additions & 1 deletion examples/machine-api-operator-config-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ apiServiceCA: |
-----END CERTIFICATE-----
provider: aws
aws:
clusterName: meh
clusterID: b302cf66-f5ff-4d5d-1cc1-0ab2755d2065
image: ami-0e502f54daeb8686e
region: eu-west-1
Expand Down
3 changes: 1 addition & 2 deletions pkg/render/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ type LibvirtConfig struct {
URI string `json:"uri"`
NetworkName string `json:"networkName"`
IPRange string `json:"ipRange"`
ClusterName string `json:"clusterName"`
ClusterID string `json:"clusterID"`
Replicas string `json:"replicas"`
}

// AWSConfig contains specific config for AWS
type AWSConfig struct {
ClusterName string `json:"clusterName"`
ClusterID string `json:"clusterID"`
Region string `json:"region"`
AvailabilityZone string `json:"availabilityZone"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/render/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestClusterapiControllerManifest(t *testing.T) {
NetworkName: "testNet",
IPRange: "192.168.124.0/24",
Replicas: "2",
ClusterName: "test",
ClusterID: "test",
},
Images: &Images{
ClusterAPIControllerManagerLibvirt: "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
Expand Down
5 changes: 2 additions & 3 deletions tests/e2e/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,8 @@ var rootCmd = &cobra.Command{
}
configValues := &render.OperatorConfig{
AWS: &render.AWSConfig{
ClusterID: clusterID,
ClusterName: clusterID,
Region: region,
ClusterID: clusterID,
Region: region,
},
}
maoConfigPopulatedData, err := render.Manifests(configValues, maoConfigTemplateData)
Expand Down