Merge branch 'main' into i_3715

.yamllint

@@ -5,6 +5,37 @@ rules:
   truthy: disable
   line-length:
     max: 1500
+    level: error
+  trailing-spaces:
+    level: error
+  comments-indentation:
+    level: error
+  comments:
+    level: error
+  braces:
+    level: error
+  indentation:
+    level: error
+  brackets:
+    level: error
+  colons:
+    level: error
+  commas:
+    level: error
+  empty-lines:
+    level: error
+  float-values:
+    level: error
+  hyphens:
+    level: error
+  key-duplicates:
+    level: error
+  new-line-at-end-of-file:
+    level: error
+  new-lines:
+    level: error
+  octal-values:
+    level: error
 
 ignore:
   - /build/.gomod/

cloudbuild.yaml

@@ -331,23 +331,23 @@ steps:
     args:
       - --bucket=gs://$_CACHE_BUCKET
       - --key=$_CPP_SDK_BUILD_CACHE_KEY-$( checksum sdks/cpp/CMakeLists.txt )
-      - --path=sdks/cpp/.build # CPP SDK build
+      - --path=sdks/cpp/.build  # CPP SDK build
     id: cpp-sdk-build-save-cache
     waitFor:
       - build-sdks
   - name: us-docker.pkg.dev/$PROJECT_ID/ci/save_cache
     args:
       - --bucket=gs://$_CACHE_BUCKET
       - --key=$_CPP_SDK_CONFORMANCE_CACHE_KEY-$( sdks/cpp/CMakeLists.txt )
-      - --path=test/sdk/cpp/sdk # CPP conformance test build
+      - --path=test/sdk/cpp/sdk  # CPP conformance test build
     id: cpp-sdk-conformance-save-cache
     waitFor:
       - sdk-conformance
   - name: us-docker.pkg.dev/$PROJECT_ID/ci/save_cache
     args:
       - --bucket=gs://$_CACHE_BUCKET
       - --key=$_RUST_SDK_BUILD_CACHE_KEY-$( checksum test/sdk/rust/Cargo.toml )
-      - --path=test/sdk/rust/.cargo # Rust conformance test build
+      - --path=test/sdk/rust/.cargo  # Rust conformance test build
       - --path=test/sdk/rust/.cargo-targets
       - --no-clobber
     id: rust-build-save-cache
@@ -357,7 +357,7 @@ steps:
     args:
       - --bucket=gs://$_CACHE_BUCKET
       - --key=$_HTMLTEST_CACHE_KEY
-      - --path=site/tmp # htmltest URL checks
+      - --path=site/tmp  # htmltest URL checks
     id: htmltest-save-cache
     waitFor:
       - tests

examples/gameserverallocation.yaml

@@ -85,6 +85,7 @@ spec:
       mode: deathmatch
     annotations:
       map: garden22
+  # yamllint disable rule:comments-indentation rule:line-length
   # [Stage: Alpha]
   # [FeatureFlag:CountsAndLists]
   # `Priorities` configuration alters the order in which `GameServers` are searched for matches to the configured `selectors`.

site/content/en/docs/Integration Patterns/allocation-from-fleet.md

@@ -20,9 +20,9 @@ label selector to target a specific `Fleet` by name. In this instance, we are ta
 apiVersion: "allocation.agones.dev/v1"
 kind: GameServerAllocation
 spec:
-  required:
-    matchLabels:
-      agones.dev/fleet: xonotic
+  selectors:
+    - matchLabels:
+        agones.dev/fleet: xonotic
 ```
 
 ## Next Steps:

site/content/en/docs/Integration Patterns/canary-testing.md

@@ -32,15 +32,14 @@ To ensure we don't have to change the Allocation system every time we have a can
 state that in our system, the label `canary: "true"` will be added to any canary `Fleet` in the cluster.   
 
 ```yaml
-apiVersion: "allocation.agones.dev/v1"
+apiVersion: allocation.agones.dev/v1
 kind: GameServerAllocation
 spec:
-  preferred:
+  selectors:
     - matchLabels:
         canary: "true"
-  required:
-    matchLabels:
-      agones.dev/fleet: stable
+    - matchLabels:
+        agones.dev/fleet: stable
 ```
 
 The above `Allocation` will then preferentially choose the `Fleet` that has `GameServers` with the label and key