Merge branch 'googleforgames:main' into afp

build/Makefile

@@ -70,7 +70,7 @@ GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.3
 BETA_FEATURE_GATES ?= "AutopilotPassthroughPort=true&CountsAndLists=true&DisableResyncOnSDKServer=true&GKEAutopilotExtendedDurationPods=true"
 
 # Enable all alpha feature gates. Keep in sync with `false` (alpha) entries in pkg/util/runtime/features.go:featureDefaults
-ALPHA_FEATURE_GATES ?= "PlayerAllocationFilter=true&PlayerTracking=true&RollingUpdateFix=true&PortRanges=true&PortPolicyNone=true&ScheduledAutoscaler=true&Example=true"
+ALPHA_FEATURE_GATES ?= "PlayerAllocationFilter=true&FleetAutoscaleRequestMetaData=true&PlayerTracking=true&RollingUpdateFix=true&PortRanges=true&PortPolicyNone=true&ScheduledAutoscaler=true&Example=true"
 
 # Build with Windows support
 WITH_WINDOWS=1

cloudbuild.yaml

@@ -440,7 +440,7 @@ steps:
         declare -A versionsAndRegions=( [1.29]=europe-west1 [1.30]=asia-east1 [1.31]=us-east1 )
 
         # Keep in sync with (the inverse of) pkg/util/runtime/features.go:featureDefaults
-        featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&CountsAndLists=false&RollingUpdateFix=true&PortRanges=true&PortPolicyNone=true&ScheduledAutoscaler=true&DisableResyncOnSDKServer=false&AutopilotPassthroughPort=false&GKEAutopilotExtendedDurationPods=false&Example=true"
+        featureWithGate="PlayerAllocationFilter=true&FleetAutoscaleRequestMetaData=true&PlayerTracking=true&CountsAndLists=false&RollingUpdateFix=true&PortRanges=true&PortPolicyNone=true&ScheduledAutoscaler=true&DisableResyncOnSDKServer=false&AutopilotPassthroughPort=false&GKEAutopilotExtendedDurationPods=false&Example=true"
         featureWithoutGate=""
 
         # Use this if specific feature gates can only be supported on specific Kubernetes versions.

install/helm/agones/defaultfeaturegates.yaml

@@ -21,6 +21,7 @@ CountsAndLists: true
 DisableResyncOnSDKServer: true
 
 # Alpha features
+FleetAutoscaleRequestMetaData: false
 PlayerAllocationFilter: false
 PlayerTracking: false
 RollingUpdateFix: false

pkg/apis/autoscaling/v1/fleetautoscaler.go

@@ -316,6 +316,10 @@ type FleetAutoscaleRequest struct {
 	Namespace string `json:"namespace"`
 	// The Fleet's status values
 	Status agonesv1.FleetStatus `json:"status"`
+	// Standard map labels; More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels.
+	Labels map[string]string `json:"labels,omitempty"`
+	// Standard map annotations; More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations.
+	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
 // FleetAutoscaleResponse defines the response of webhook autoscaler endpoint

pkg/fleetautoscalers/fleetautoscalers.go

@@ -172,6 +172,11 @@ func applyWebhookPolicy(w *autoscalingv1.WebhookPolicy, f *agonesv1.Fleet) (repl
 		Response: nil,
 	}
 
+	if runtime.FeatureEnabled(runtime.FeatureFleetAutoscaleRequestMetaData) {
+		faReq.Request.Annotations = f.ObjectMeta.Annotations
+		faReq.Request.Labels = f.ObjectMeta.Labels
+	}
+
 	b, err := json.Marshal(faReq)
 	if err != nil {
 		return 0, false, err

pkg/fleetautoscalers/fleetautoscalers_test.go

@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"strconv"
 	"testing"
 	"time"
 
@@ -92,6 +93,15 @@ func (t testServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		faResp.Replicas = faReq.Status.Replicas * scaleFactor
 	}
 
+	// override value for tests
+	if faReq.Annotations != nil {
+		if value, ok := faReq.Annotations["fixedReplicas"]; ok {
+			faResp.Scale = true
+			replicas, _ := strconv.Atoi(value)
+			faResp.Replicas = int32(replicas)
+		}
+	}
+
 	review := &autoscalingv1.FleetAutoscaleReview{
 		Request:  faReq,
 		Response: &faResp,
@@ -579,6 +589,41 @@ func TestApplyWebhookPolicy(t *testing.T) {
 	}
 }
 
+func TestApplyWebhookPolicyWithMetadata(t *testing.T) {
+	t.Parallel()
+
+	utilruntime.FeatureTestMutex.Lock()
+	defer utilruntime.FeatureTestMutex.Unlock()
+
+	err := utilruntime.ParseFeatures(string(utilruntime.FeatureFleetAutoscaleRequestMetaData) + "=true")
+	assert.NoError(t, err)
+	defer func() {
+		_ = utilruntime.ParseFeatures("")
+	}()
+
+	ts := testServer{}
+	server := httptest.NewServer(ts)
+	defer server.Close()
+
+	_, fleet := defaultWebhookFixtures()
+
+	fixedReplicas := int32(11)
+	fleet.ObjectMeta.Annotations = map[string]string{
+		"fixedReplicas": fmt.Sprintf("%d", fixedReplicas),
+	}
+
+	webhookPolicy := &autoscalingv1.WebhookPolicy{
+		Service: nil,
+		URL:     &(server.URL),
+	}
+
+	replicas, limited, err := applyWebhookPolicy(webhookPolicy, fleet)
+
+	assert.Nil(t, err)
+	assert.False(t, limited)
+	assert.Equal(t, fixedReplicas, replicas)
+}
+
 func TestApplyWebhookPolicyNilFleet(t *testing.T) {
 	t.Parallel()
 

pkg/util/runtime/features.go

@@ -48,6 +48,9 @@ const (
 	////////////////
 	// Alpha features
 
+	// FeatureFleetAutoscaleRequestMetaData is a feature flag that enables/disables fleet metadata on webhook autoscaler request.
+	FeatureFleetAutoscaleRequestMetaData Feature = "FleetAutoscaleRequestMetaData"
+
 	// FeaturePlayerAllocationFilter is a feature flag that enables the ability for Allocations to filter based on
 	// player capacity.
 	FeaturePlayerAllocationFilter Feature = "PlayerAllocationFilter"
@@ -134,12 +137,13 @@ var (
 		FeatureDisableResyncOnSDKServer:         true,
 
 		// Alpha features
-		FeaturePlayerAllocationFilter: false,
-		FeaturePlayerTracking:         false,
-		FeatureRollingUpdateFix:       false,
-		FeaturePortRanges:             false,
-		FeaturePortPolicyNone:         false,
-		FeatureScheduledAutoscaler:    false,
+		FeatureFleetAutoscaleRequestMetaData: false,
+		FeaturePlayerAllocationFilter:        false,
+		FeaturePlayerTracking:                false,
+		FeatureRollingUpdateFix:              false,
+		FeaturePortRanges:                    false,
+		FeaturePortPolicyNone:                false,
+		FeatureScheduledAutoscaler:           false,
 
 		// Dev features
 

site/content/en/docs/Guides/feature-stages.md

@@ -24,7 +24,25 @@ that can be found in the [Helm configuration]({{< ref "/docs/Installation/Instal
 
 The current set of `alpha` and `beta` feature gates:
 
+{{% feature expiryVersion="1.48.0" %}}
 
+| Feature Name                                                                                                                | Gate                               | Default  | Stage   | Since  |
+|-----------------------------------------------------------------------------------------------------------------------------|------------------------------------|----------|---------|--------|
+| [CountsAndLists](https://github.com/googleforgames/agones/issues/2716)                                                      | `CountsAndLists`                   | Enabled  | `Beta`  | 1.41.0 |
+| [DisableResyncOnSDKServer](https://github.com/googleforgames/agones/issues/3377)                                            | `DisableResyncOnSDKServer`         | Enabled  | `Beta`  | 1.40.0 |
+| [Support Passthrough on GKE Autopilot](https://github.com/googleforgames/agones/issues/3721)                                | `AutopilotPassthroughPort`         | Enabled  | `Beta`  | 1.43.0 |
+| [Support for Extended Duration Pods on GKE Autopilot (*1.28+ only*)](https://github.com/googleforgames/agones/issues/3386)  | `GKEAutopilotExtendedDurationPods` | Enabled  | `Beta`  | 1.44.0 |
+| [GameServer player capacity filtering on GameServerAllocations](https://github.com/googleforgames/agones/issues/1239)       | `PlayerAllocationFilter`           | Disabled | `Alpha` | 1.14.0 |
+| [Player Tracking]({{< ref "/docs/Guides/player-tracking.md" >}})                                                            | `PlayerTracking`                   | Disabled | `Alpha` | 1.6.0  |
+| [Rolling Update Fixes](https://github.com/googleforgames/agones/issues/3688)                                                | `RollingUpdateFix`                 | Disabled | `Alpha` | 1.41.0 |
+| [Multiple dynamic port ranges](https://github.com/googleforgames/agones/issues/1911)                                        | `PortRanges`                       | Disabled | `Alpha` | 1.41.0 |
+| [Port Policy None](https://github.com/googleforgames/agones/issues/3804)                                                    | `PortPolicyNone`                   | Disabled | `Alpha` | 1.41.0 |
+| [Scheduled Fleet Autoscaling](https://github.com/googleforgames/agones/issues/3008)                                         | `ScheduledAutoscaler`              | Disabled | `Alpha` | 1.43.0 |
+| Example Gate (not in use)                                                                                                   | `Example`                          | Disabled | None    | 0.13.0 |
+
+{{% /feature %}}
+
+{{% feature publishVersion="1.48.0" %}}
 
 | Feature Name                                                                                                                | Gate                               | Default  | Stage   | Since  |
 |-----------------------------------------------------------------------------------------------------------------------------|------------------------------------|----------|---------|--------|
@@ -38,8 +56,10 @@ The current set of `alpha` and `beta` feature gates:
 | [Multiple dynamic port ranges](https://github.com/googleforgames/agones/issues/1911)                                        | `PortRanges`                       | Disabled | `Alpha` | 1.41.0 |
 | [Port Policy None](https://github.com/googleforgames/agones/issues/3804)                                                    | `PortPolicyNone`                   | Disabled | `Alpha` | 1.41.0 |
 | [Scheduled Fleet Autoscaling](https://github.com/googleforgames/agones/issues/3008)                                         | `ScheduledAutoscaler`              | Disabled | `Alpha` | 1.43.0 |
+| [Extend Webhook autoscaler to send fleet metadata with the request](https://github.com/googleforgames/agones/issues/3951)   | `FleetAutoscaleRequestMetaData`    | Disabled | `Alpha` | 1.48.0 |
 | Example Gate (not in use)                                                                                                   | `Example`                          | Disabled | None    | 0.13.0 |
 
+{{% /feature %}}
 
 [fleet-updates]: {{% relref "./fleet-updates.md#notifying-gameservers-on-fleet-updatedownscale" %}}
 

site/content/en/docs/Reference/fleetautoscaler.md

@@ -374,6 +374,10 @@ type FleetAutoscaleRequest struct {
 	Namespace string `json:"namespace"`
 	// The Fleet's status values
 	Status v1.FleetStatus `json:"status"`
+{{% feature publishVersion="1.48.0" %}}
+	// Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
+	MetaData *metav1.ObjectMeta `json:"metadata,omitempty"`
+{{% /feature %}}
 }
 
 type FleetAutoscaleResponse struct {