Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@gongmax
gongmax committed Jan 6, 2023
1 parent d388de1 commit 331581d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 295 deletions.
18 changes: 18 additions & 0 deletions pkg/apis/agones/v1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

298 changes: 3 additions & 295 deletions site/content/en/docs/Reference/agones_crd_api_reference.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3029,9 +3029,6 @@ <h3 id="agones.dev/v1.SdkServerLogLevel">SdkServerLogLevel
<p>Packages:</p>
<ul>
<li>
<a href="#multicluster.agones.dev%2fv1">multicluster.agones.dev/v1</a>
</li>
<li>
<a href="#agones.dev%2fv1">agones.dev/v1</a>
</li>
<li>
Expand All @@ -3040,296 +3037,10 @@ <h3 id="agones.dev/v1.SdkServerLogLevel">SdkServerLogLevel
<li>
<a href="#autoscaling.agones.dev%2fv1">autoscaling.agones.dev/v1</a>
</li>
<li>
<a href="#multicluster.agones.dev%2fv1">multicluster.agones.dev/v1</a>
</li>
</ul>
<h2 id="multicluster.agones.dev/v1">multicluster.agones.dev/v1</h2>
<p>
<p>Package v1 is the v1 version of the API.</p>
</p>
Resource Types:
<ul><li>
<a href="#multicluster.agones.dev/v1.GameServerAllocationPolicy">GameServerAllocationPolicy</a>
</li></ul>
<h3 id="multicluster.agones.dev/v1.GameServerAllocationPolicy">GameServerAllocationPolicy
</h3>
<p>
<p>GameServerAllocationPolicy is the Schema for the gameserverallocationpolicies API</p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>apiVersion</code></br>
string</td>
<td>
<code>
multicluster.agones.dev/v1
</code>
</td>
</tr>
<tr>
<td>
<code>kind</code></br>
string
</td>
<td><code>GameServerAllocationPolicy</code></td>
</tr>
<tr>
<td>
<code>metadata</code></br>
<em>
<a href="https://v1-23.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#objectmeta-v1-meta">
Kubernetes meta/v1.ObjectMeta
</a>
</em>
</td>
<td>
Refer to the Kubernetes API documentation for the fields of the
<code>metadata</code> field.
</td>
</tr>
<tr>
<td>
<code>spec</code></br>
<em>
<a href="#multicluster.agones.dev/v1.GameServerAllocationPolicySpec">
GameServerAllocationPolicySpec
</a>
</em>
</td>
<td>
<br/>
<br/>
<table>
<tr>
<td>
<code>priority</code></br>
<em>
int32
</em>
</td>
<td>
</td>
</tr>
<tr>
<td>
<code>weight</code></br>
<em>
int
</em>
</td>
<td>
</td>
</tr>
<tr>
<td>
<code>connectionInfo</code></br>
<em>
<a href="#multicluster.agones.dev/v1.ClusterConnectionInfo">
ClusterConnectionInfo
</a>
</em>
</td>
<td>
</td>
</tr>
</table>
</td>
</tr>
</tbody>
</table>
<h3 id="multicluster.agones.dev/v1.ClusterConnectionInfo">ClusterConnectionInfo
</h3>
<p>
(<em>Appears on:</em>
<a href="#multicluster.agones.dev/v1.GameServerAllocationPolicySpec">GameServerAllocationPolicySpec</a>)
</p>
<p>
<p>ClusterConnectionInfo defines the connection information for a cluster</p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>clusterName</code></br>
<em>
string
</em>
</td>
<td>
<p>Optional: the name of the targeted cluster</p>
</td>
</tr>
<tr>
<td>
<code>allocationEndpoints</code></br>
<em>
[]string
</em>
</td>
<td>
<p>The endpoints for the allocator service in the targeted cluster.
If the AllocationEndpoints is not set, the allocation happens on local cluster.
If there are multiple endpoints any of the endpoints that can handle allocation request should suffice</p>
</td>
</tr>
<tr>
<td>
<code>secretName</code></br>
<em>
string
</em>
</td>
<td>
<p>The name of the secret that contains TLS client certificates to connect the allocator server in the targeted cluster</p>
</td>
</tr>
<tr>
<td>
<code>namespace</code></br>
<em>
string
</em>
</td>
<td>
<p>The cluster namespace from which to allocate gameservers</p>
</td>
</tr>
<tr>
<td>
<code>serverCa</code></br>
<em>
[]byte
</em>
</td>
<td>
<p>The PEM encoded server CA, used by the allocator client to authenticate the remote server.</p>
</td>
</tr>
</tbody>
</table>
<h3 id="multicluster.agones.dev/v1.ConnectionInfoIterator">ConnectionInfoIterator
</h3>
<p>
<p>ConnectionInfoIterator an iterator on ClusterConnectionInfo</p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>currPriority</code></br>
<em>
int
</em>
</td>
<td>
<p>currPriority Current priority index from the orderedPriorities</p>
</td>
</tr>
<tr>
<td>
<code>orderedPriorities</code></br>
<em>
[]int32
</em>
</td>
<td>
<p>orderedPriorities list of ordered priorities</p>
</td>
</tr>
<tr>
<td>
<code>priorityToCluster</code></br>
<em>
map[int32]map[string][]*agones.dev/agones/pkg/apis/multicluster/v1.GameServerAllocationPolicy
</em>
</td>
<td>
<p>priorityToCluster Map of priority to cluster-policies map</p>
</td>
</tr>
<tr>
<td>
<code>clusterBlackList</code></br>
<em>
map[string]bool
</em>
</td>
<td>
<p>clusterBlackList the cluster blacklist for the clusters that has already returned</p>
</td>
</tr>
</tbody>
</table>
<h3 id="multicluster.agones.dev/v1.GameServerAllocationPolicySpec">GameServerAllocationPolicySpec
</h3>
<p>
(<em>Appears on:</em>
<a href="#multicluster.agones.dev/v1.GameServerAllocationPolicy">GameServerAllocationPolicy</a>)
</p>
<p>
<p>GameServerAllocationPolicySpec defines the desired state of GameServerAllocationPolicy</p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>priority</code></br>
<em>
int32
</em>
</td>
<td>
</td>
</tr>
<tr>
<td>
<code>weight</code></br>
<em>
int
</em>
</td>
<td>
</td>
</tr>
<tr>
<td>
<code>connectionInfo</code></br>
<em>
<a href="#multicluster.agones.dev/v1.ClusterConnectionInfo">
ClusterConnectionInfo
</a>
</em>
</td>
<td>
</td>
</tr>
</tbody>
</table>
<hr/>
<h2 id="agones.dev/v1">agones.dev/v1</h2>
<p>
<p>Package v1 is the v1 version of the API.</p>
Expand Down Expand Up @@ -6159,8 +5870,6 @@ <h3 id="autoscaling.agones.dev/v1.WebhookPolicy">WebhookPolicy
</tbody>
</table>
<hr/>
<<<<<<< HEAD
=======
<h2 id="multicluster.agones.dev/v1">multicluster.agones.dev/v1</h2>
<p>
<p>Package v1 is the v1 version of the API.</p>
Expand Down Expand Up @@ -6450,7 +6159,6 @@ <h3 id="multicluster.agones.dev/v1.GameServerAllocationPolicySpec">GameServerAll
</tbody>
</table>
<hr/>
>>>>>>> d716953eb (Update CRD API reference)
<p><em>
Generated with <code>gen-crd-api-reference-docs</code>.
</em></p>
Expand Down

0 comments on commit 331581d

Please sign in to comment.