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.

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

Rename APIServerEndpoint to AllocationEndpoint for multi-cluster allocation #755

Merged
merged 1 commit into from
May 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ spec:
properties:
secretName:
type: string
apiServerEndpoint:
allocationEndpoint:
type: string
clusterName:
type: string
required:
- clusterName
- apiServerEndpoint
- allocationEndpoint
- secretName
type: object
priority:
Expand Down
4 changes: 2 additions & 2 deletions install/yaml/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -732,13 +732,13 @@ spec:
properties:
secretName:
type: string
apiServerEndpoint:
allocationEndpoint:
type: string
clusterName:
type: string
required:
- clusterName
- apiServerEndpoint
- allocationEndpoint
- secretName
type: object
priority:
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/multicluster/v1alpha1/gameserverallocationpolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ type GameServerAllocationPolicySpec struct {

// ClusterConnectionInfo defines the connection information for a cluster
type ClusterConnectionInfo struct {
ClusterName string `json:"clusterName"`
APIServerEndpoint string `json:"apiServerEndpoint"`
SecretName string `json:"secretName"`
ClusterName string `json:"clusterName"`
AllocationEndpoint string `json:"allocationEndpoint"`
SecretName string `json:"secretName"`
}

// +genclient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ func TestConnectionInfoIterator(t *testing.T) {
Priority: 1,
Weight: 100,
ConnectionInfo: ClusterConnectionInfo{
ClusterName: "cluster1",
SecretName: "secret-name",
APIServerEndpoint: "api-server-endpoint",
ClusterName: "cluster1",
SecretName: "secret-name",
AllocationEndpoint: "allocation-endpoint",
},
},
},
},
want: []ClusterConnectionInfo{
{
ClusterName: "cluster1",
SecretName: "secret-name",
APIServerEndpoint: "api-server-endpoint",
ClusterName: "cluster1",
SecretName: "secret-name",
AllocationEndpoint: "allocation-endpoint",
},
},
},
Expand Down