googleforgames · zmerlynn · Dec 5, 2023 · Nov 29, 2023 · Nov 30, 2023 · Nov 30, 2023
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -296,10 +296,10 @@ steps:
             region=${versionsAndRegions[$version]}
             if [ $cloudProduct = generic ]
             then
-              featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&SplitControllerAndExtensions=false&FleetAllocationOverflow=false&CountsAndLists=true&DisableResyncOnSDKServer=true&Example=true"
+              featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&FleetAllocationOverflow=false&CountsAndLists=true&DisableResyncOnSDKServer=true&Example=true"
               testCluster="standard-e2e-test-cluster-${version//./-}"
             else
-              featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&SplitControllerAndExtensions=true&FleetAllocationOverflow=false&CountsAndLists=true&DisableResyncOnSDKServer=true&Example=true"
+              featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&FleetAllocationOverflow=false&CountsAndLists=true&DisableResyncOnSDKServer=true&Example=true"
               testCluster="gke-autopilot-e2e-test-cluster-${version//./-}"
             fi
             featureWithoutGate=""

diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -30,15 +30,11 @@ import (
 	"agones.dev/agones/pkg/cloudproduct"
 	"agones.dev/agones/pkg/fleetautoscalers"
 	"agones.dev/agones/pkg/fleets"
-	"agones.dev/agones/pkg/gameserverallocations"
 	"agones.dev/agones/pkg/gameservers"
 	"agones.dev/agones/pkg/gameserversets"
 	"agones.dev/agones/pkg/metrics"
-	"agones.dev/agones/pkg/util/apiserver"
-	"agones.dev/agones/pkg/util/https"
 	"agones.dev/agones/pkg/util/runtime"
 	"agones.dev/agones/pkg/util/signals"
-	"agones.dev/agones/pkg/util/webhooks"
 	"github.com/google/uuid"
 	"github.com/heptiolabs/healthcheck"
 	"github.com/pkg/errors"
@@ -165,10 +161,6 @@ func main() {
 	if err != nil {
 		logger.WithError(err).Fatal("Could not initialize cloud product")
 	}
-	// https server and the items that share the Mux for routing
-	httpsServer := https.NewServer(ctlConf.CertFile, ctlConf.KeyFile)
-	wh := webhooks.NewWebHook(httpsServer.Mux)
-	api := apiserver.NewAPIServer(httpsServer.Mux)
 
 	agonesInformerFactory := externalversions.NewSharedInformerFactory(agonesClient, defaultResync)
 	kubeInformerFactory := informers.NewSharedInformerFactory(kubeClient, defaultResync)
@@ -228,17 +220,6 @@ func main() {
 	rs = append(rs,
 		gsCounter, gsController, gsSetController, fleetController, fasController)
 
-	if !runtime.FeatureEnabled(runtime.FeatureSplitControllerAndExtensions) {
-		gameservers.NewExtensions(controllerHooks, wh)
-		gameserversets.NewExtensions(controllerHooks, wh)
-		fleets.NewExtensions(controllerHooks, wh)
-		fleetautoscalers.NewExtensions(wh)
-
-		gasController := gameserverallocations.NewExtensions(api, health, gsCounter, kubeClient, kubeInformerFactory,
-			agonesClient, agonesInformerFactory, 10*time.Second, 30*time.Second, ctlConf.AllocationBatchWaitTime)
-		rs = append(rs, httpsServer, gasController)
-	}
-
 	runRunner := func(r runner) {
 		if err := r.Run(ctx, ctlConf.NumWorkers); err != nil {
 			logger.WithError(err).Fatalf("could not start runner! %T", r)

diff --git a/install/helm/agones/defaultfeaturegates.yaml b/install/helm/agones/defaultfeaturegates.yaml
@@ -16,7 +16,6 @@
 
 # Beta features
 FleetAllocationOverflow: true
-SplitControllerAndExtensions: true
 
 # Alpha features
 PlayerAllocationFilter: false

diff --git a/install/helm/agones/templates/controller.yaml b/install/helm/agones/templates/controller.yaml
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- $featureGates := include "agones.featureGates" . | fromYaml }}
 {{- $replicas := (int .Values.agones.controller.replicas) }}
-{{- if not $featureGates.SplitControllerAndExtensions }}
-{{- $replicas = 1 }}
-{{- end }}
 {{- if lt $replicas 1 }}
 {{- fail "agones.controller.replica field has an invalid value!" }}
 {{- end }}

diff --git a/install/helm/agones/templates/extensions-deployment.yaml b/install/helm/agones/templates/extensions-deployment.yaml
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- $featureGates := include "agones.featureGates" . | fromYaml }}
-{{- if $featureGates.SplitControllerAndExtensions }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -209,4 +207,3 @@ spec:
       app: {{ template "agones.name" . }}
       release: {{ .Release.Name }}
       heritage: {{ .Release.Service }}
-{{- end }}
diff --git a/install/helm/agones/templates/extensions-metrics-service.yaml b/install/helm/agones/templates/extensions-metrics-service.yaml
@@ -11,8 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-{{- $featureGates := include "agones.featureGates" . | fromYaml }}
-{{- if $featureGates.SplitControllerAndExtensions }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -31,4 +30,3 @@ spec:
     - name: metrics
       port: {{ .Values.agones.controller.http.port }}
       targetPort: http
-{{- end}}
diff --git a/install/helm/agones/templates/service.yaml b/install/helm/agones/templates/service.yaml
@@ -19,22 +19,14 @@ metadata:
   name: agones-controller-service
   namespace: {{ .Release.Namespace }}
   labels:
-{{- if $featureGates.SplitControllerAndExtensions }}
     agones.dev/role: extensions
-{{- else}}
-    agones.dev/role: controller
-{{- end}}
     app: {{ template "agones.name" . }}
     chart: {{ template "agones.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   selector:
-{{- if $featureGates.SplitControllerAndExtensions }}
     agones.dev/role: extensions
-{{- else}}
-    agones.dev/role: controller
-{{- end}}
   ports:
     - name: webhooks
       port: 443

diff --git a/install/helm/agones/values.yaml b/install/helm/agones/values.yaml
@@ -253,7 +253,6 @@ agones:
     controller:
       name: agones-controller
       pullPolicy: IfNotPresent
-    # extensions settings ignored unless `SplitControllerAndExtensions` feature gate is enabled
     extensions:
       name: agones-extensions
       pullPolicy: IfNotPresent

diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml
@@ -16800,6 +16800,7 @@ spec:
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -17128,6 +17129,7 @@ spec:
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/pkg/util/runtime/features.go b/pkg/util/runtime/features.go
@@ -31,8 +31,9 @@ const (
 	////////////////
 	// Beta features
 
-	// FeatureSplitControllerAndExtensions is a feature flag that will split agones-controller into two deployments
-	FeatureSplitControllerAndExtensions Feature = "SplitControllerAndExtensions"
+	// FeatureFleetAllocateOverflow enables setting labels and/or annotations on Allocated GameServers
+	// if the desired number of the underlying GameServerSet drops below the number of Allocated GameServers.
+	FeatureFleetAllocateOverflow Feature = "FleetAllocationOverflow"
 
 	////////////////
 	// Alpha features
@@ -44,10 +45,6 @@ const (
 	// FeaturePlayerTracking is a feature flag to enable/disable player tracking features.
 	FeaturePlayerTracking Feature = "PlayerTracking"
 
-	// FeatureFleetAllocateOverflow enables setting labels and/or annotations on Allocated GameServers
-	// if the desired number of the underlying GameServerSet drops below the number of Allocated GameServers.
-	FeatureFleetAllocateOverflow = "FleetAllocationOverflow"
-
 	// FeatureCountsAndLists is a feature flag that enables/disables counts and lists feature
 	// (a generic implenetation of the player tracking feature).
 	FeatureCountsAndLists Feature = "CountsAndLists"
@@ -91,8 +88,7 @@ var (
 	// In each of these, keep the feature sorted by descending maturity then alphabetical
 	featureDefaults = map[Feature]bool{
 		// Beta features
-		FeatureFleetAllocateOverflow:        true,
-		FeatureSplitControllerAndExtensions: true,
+		FeatureFleetAllocateOverflow: true,
 
 		// Alpha features
 		FeaturePlayerAllocationFilter:   false,

diff --git a/site/content/en/docs/Advanced/high-availability-agones.md b/site/content/en/docs/Advanced/high-availability-agones.md
@@ -7,15 +7,25 @@ description: >
 publishDate: 2023-02-28
 ---
 
+{{% feature expiryVersion="1.37.0" %}}
 {{< beta title="split controller and extensions" gate="SplitControllerAndExtensions" >}}
+{{% /feature %}}
 
 ## High Availability for Agones Controller
 
+{{% feature expiryVersion="1.37.0" %}}
 When `SplitControllerAndExtensions` is enabled, the `agones-controller` responsibility is split up into `agones-controller`, which enacts the Agones control loop, and `agones-extensions`, which acts as a service endpoint for webhooks and the allocation extension API. Splitting these responsibilities allows the `agones-extensions` pod to be **horizontally scaled**, making the Agones control plane **highly available** and more **resiliant to disruption**.
 
 `SplitControllerAndExtensions` enables multiple `agones-controller` pods, with a primary controller selected via leader election. Having multiple `agones-controller` minimizes downtime of the service from pod disruptions such as deployment updates, autoscaler evictions, and crashes.
 
 `SplitControllerAndExtensions` must be enabled for GKE Autopilot.
+{{% /feature %}}
+
+{{% feature publishVersion="1.37.0" %}}
+The `agones-controller` responsibility is split up into `agones-controller`, which enacts the Agones control loop, and `agones-extensions`, which acts as a service endpoint for webhooks and the allocation extension API. Splitting these responsibilities allows the `agones-extensions` pod to be **horizontally scaled**, making the Agones control plane **highly available** and more **resiliant to disruption**.
+
+Multiple `agones-controller` pods enabled, with a primary controller selected via leader election. Having multiple `agones-controller` minimizes downtime of the service from pod disruptions such as deployment updates, autoscaler evictions, and crashes.
+{{% /feature %}}
 
 ## Extension Pod Configrations 
 
@@ -34,9 +44,17 @@ An important configuration to note is the PodDisruptionBudget fields, `agones.ex
 
 ## Deployment Considerations
 
+{{% feature expiryVersion="1.37.0" %}}
 Leader election will automatically be enabled when `SplitControllerAndExtensions` is enabled and `agones.controller.replicas` is > 1. [`agones.controller.replicas`]({{< relref "/docs/Installation/Install Agones/helm.md#configuration" >}}) defaults to 2.
 
 When `SplitControllerAndExtensions` is enabled, what was previously a single `agones-controller` pod is deployed by default as 2 `agones-controller` and 2 `agones-extensions` pods. For example:
+{{% /feature %}}
+
+{{% feature publishVersion="1.37.0" %}}
+Leader election will automatically be enabled and `agones.controller.replicas` is > 1. [`agones.controller.replicas`]({{< relref "/docs/Installation/Install Agones/helm.md#configuration" >}}) defaults to 2.
+
+The default configuration now deploys 2 `agones-controller` pods and 2 `agones-extensions` pods, replacing the previous single `agones-controller` pod setup. For example:
+{{% /feature %}}
 
 ```
 NAME                                 READY   STATUS    RESTARTS   AGE

diff --git a/site/content/en/docs/Guides/feature-stages.md b/site/content/en/docs/Guides/feature-stages.md
@@ -40,7 +40,6 @@ The current set of `alpha` and `beta` feature gates:
 | Feature Name                                                                                                          | Gate                           | Default  | Stage   | Since  |
 |-----------------------------------------------------------------------------------------------------------------------|--------------------------------|----------|---------|--------|
 | [Allocated GameServers are notified on relevant Fleet Updates][fleet-updates]                                         | `FleetAllocationOverflow`      | Enabled  | `Beta`  | 1.37.0 |
-| [Split `agones-controller` ](https://github.com/googleforgames/agones/issues/2797)                                    | `SplitControllerAndExtensions` | Enabled  | `Beta`  | 1.32.0 |
 | [CountsAndLists](https://github.com/googleforgames/agones/issues/2716)                                                | `CountsAndLists`               | Disabled | `Alpha` | 1.37.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  |

diff --git a/site/content/en/docs/Installation/Creating Cluster/gke.md b/site/content/en/docs/Installation/Creating Cluster/gke.md
@@ -319,11 +319,14 @@ Flag explanations:
 * `--release-channel`: The release channel [you chose above](#choosing-a-release-channel-and-optional-version).
 * `--autoprovisioning-network-tags`: Defines the tags that will be attached to new nodes in the cluster. This is to grant access through ports via the [firewall created above](#creating-the-firewall).
 
+{{% feature expiryVersion="1.37.0" %}}
 {{<alert title="Warning" color="warning">}}
 To install Agones on version 1.30-1.31, you must enable the `SplitControllerAndExtensions`
 [feature gate]({{% ref "/docs/Guides/feature-stages.md#feature-gates" %}}).
 This feature is enabled by default starting in Agones 1.32.0.
 {{</alert>}}
+{{% /feature %}}
+
 
 ## Setting up cluster credentials