Remove env namespace dependency from allocator service.

googleforgames · Jun 6, 2019 · 7072852 · 7072852
1 parent 84bf6c1
commit 7072852
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/cmd/allocator/main.go b/cmd/allocator/main.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -37,9 +36,10 @@ var (
 )
 
 const (
-	certDir = "/home/allocator/client-ca/"
-	tlsDir  = "/home/allocator/tls/"
-	port    = "8443"
+	certDir               = "/home/allocator/client-ca/"
+	tlsDir                = "/home/allocator/tls/"
+	port                  = "8443"
+	agonesSystemNamespace = "agones-system"
 )
 
 // A handler for the web server
@@ -53,7 +53,6 @@ func main() {
 
 	h := httpHandler{
 		agonesClient: agonesClient,
-		namespace:    os.Getenv("NAMESPACE"),
 	}
 
 	// TODO: add liveness probe
@@ -133,7 +132,6 @@ func (h *httpHandler) postOnly(in handler) handler {
 
 type httpHandler struct {
 	agonesClient versioned.Interface
-	namespace    string
 }
 
 func (h *httpHandler) allocateHandler(w http.ResponseWriter, r *http.Request) {
@@ -143,7 +141,7 @@ func (h *httpHandler) allocateHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	allocation := h.agonesClient.AllocationV1alpha1().GameServerAllocations(h.namespace)
+	allocation := h.agonesClient.AllocationV1alpha1().GameServerAllocations(agonesSystemNamespace)
 	allocatedGsa, err := allocation.Create(&gsa)
 	if err != nil {
 		http.Error(w, err.Error(), httpCode(err))

diff --git a/cmd/allocator/main_test.go b/cmd/allocator/main_test.go
@@ -26,6 +26,7 @@ import (
 	agonesfake "agones.dev/agones/pkg/client/clientset/versioned/fake"
 	"github.com/stretchr/testify/assert"
 	k8serror "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	k8stesting "k8s.io/client-go/testing"
 )
@@ -36,11 +37,13 @@ func TestAllocateHandler(t *testing.T) {
 	fakeAgones := &agonesfake.Clientset{}
 	h := httpHandler{
 		agonesClient: fakeAgones,
-		namespace:    "default",
 	}
 
 	fakeAgones.AddReactor("create", "gameserverallocations", func(action k8stesting.Action) (bool, k8sruntime.Object, error) {
 		return true, &v1alpha1.GameServerAllocation{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "default",
+			},
 			Status: v1alpha1.GameServerAllocationStatus{
 				State: v1alpha1.GameServerAllocationContention,
 			},
@@ -72,7 +75,6 @@ func TestAllocateHandlerReturnsError(t *testing.T) {
 	fakeAgones := &agonesfake.Clientset{}
 	h := httpHandler{
 		agonesClient: fakeAgones,
-		namespace:    "default",
 	}
 
 	fakeAgones.AddReactor("create", "gameserverallocations", func(action k8stesting.Action) (bool, k8sruntime.Object, error) {

diff --git a/install/helm/agones/templates/service/allocation.yaml b/install/helm/agones/templates/service/allocation.yaml
@@ -85,11 +85,6 @@ spec:
         - mountPath: /home/allocator/client-ca
           name: client-ca
           readOnly: true
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
 
 ---
 # Create a Role in the default namespace that grants access to the agones api
@@ -200,4 +195,4 @@ data:
   tls-ca.crt: {{ b64enc $ca.Cert }}
 {{- else }}
   tls-ca.crt: {{ .Files.Get "certs/allocator/server.crt" | b64enc }}
-{{- end }}
+{{- end }}
diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml
@@ -1077,11 +1077,6 @@ spec:
         - mountPath: /home/allocator/client-ca
           name: client-ca
           readOnly: true
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
 
 ---
 # Create a Role in the default namespace that grants access to the agones api
@@ -1177,6 +1172,7 @@ metadata:
     heritage: "Tiller"
 data:
   tls-ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR5ekNDQXJPZ0F3SUJBZ0lVS2JaV1IwSmk2QlRxa2RiQjkwT200dUpIaTM4d0RRWUpLb1pJaHZjTkFRRUwKQlFBd2RURUxNQWtHQTFVRUJoTUNRVlV4RXpBUkJnTlZCQWdNQ2xOdmJXVXRVM1JoZEdVeElUQWZCZ05WQkFvTQpHRWx1ZEdWeWJtVjBJRmRwWkdkcGRITWdVSFI1SUV4MFpERXVNQ3dHQ1NxR1NJYjNEUUVKQVJZZllXZHZibVZ6CkxXUnBjMk4xYzNOQVoyOXZaMnhsWjNKdmRYQnpMbU52YlRBZUZ3MHhPVEExTVRReE9ETXhOVGxhRncweU9UQTEKTVRFeE9ETXhOVGxhTUhVeEN6QUpCZ05WQkFZVEFrRlZNUk13RVFZRFZRUUlEQXBUYjIxbExWTjBZWFJsTVNFdwpId1lEVlFRS0RCaEpiblJsY201bGRDQlhhV1JuYVhSeklGQjBlU0JNZEdReExqQXNCZ2txaGtpRzl3MEJDUUVXCkgyRm5iMjVsY3kxa2FYTmpkWE56UUdkdmIyZHNaV2R5YjNWd2N5NWpiMjB3Z2dFaU1BMEdDU3FHU0liM0RRRUIKQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURldHlVTHdOdWpGYlhadEdGY09DQXdUWWZVNTRENEd3ZGsxdDdSV3FhNQovL3JpS3N3cWtjcnc2OGxOa0lObSt5TU5nRmtkdDJ6Z2x3akNnakpaWGNGb3ZQLzcvZzMyQ041VzZneXg3Y0IwCkZUWEpWV2UzdVVHNlBXNVlQYUgxMkN1Y0hDcTVpTnp3bEV5RFVQQ0pBYVBPNWZVQmxiQ1JVTFlQaEJuSlhaWHIKQjZ6ZHRjNlIxdXlrWE5mVmhaWUh2SVZyNW9XSUZ5Z0NObmp2TWdIbWt2ZkxOeGltU2dwc0tYeUxqVzExU1d3eApteHBwb3drbHdLMlFxYXhuYVNPVFl2N3VjbUwwTzhYRTg5bi9TbzFZbklPZ2RReU5tTmFVSjRENk1oeHZLZUpBClRmZzZrOTFRd1c5K0VJaWh0K05qQ01zcHg0bjZ5bGlSbm8xR01Ic1pJamJIQWdNQkFBR2pVekJSTUIwR0ExVWQKRGdRV0JCUXhqcnJ0S3BOcE02TUg5ODY4cTY1ZHE0NzcwVEFmQmdOVkhTTUVHREFXZ0JReGpycnRLcE5wTTZNSAo5ODY4cTY1ZHE0NzcwVEFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUNvCmNGc3hzY0ZOajh3VGt1aHZtRUcyODV6Q3M5OFFqR3FzT1RCNC9Ha3JUbWJOUW9xT2JuYzZpTkM0YnM5QUM2SE8KYWJOUkM2bTVVYVZRVkgzVUI2TzMrRm00MFROb1RadDFHQkYzL0x0ZHdnZFJrbUZUaGlCL2ZJdHRUMFBHYUVmZQpBK3lleWhOYlZ5VWdPWUk3bks1UEs1czdnQlN5a0dMelhJaWVsb21tckE2SzI5L1pObGoraE53S1dISUJaL0NuCmNPa1ZnUEJrZUJrWStWclZjM24vSEJjbGorczdSNzVLcmhwTktPTWZ2M2pvcmhSQVE4ZVFvSWhIYmlxY2JNN3EKbHpwbDM5VXhzajJWMVlCYXl1OWlubXFKaUJmNFNNdW50elVwUHpLYWwwTytpZUtBMmJLU1NUbEdHbnIzUlJ2eQpNWGRnN1pYWmV3S3FiYlMvQnJIcQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+
 ---
 # Source: agones/templates/controller.yaml
 # Copyright 2018 Google LLC All Rights Reserved.

diff --git a/test/e2e/allocator_test.go b/test/e2e/allocator_test.go
@@ -60,6 +60,9 @@ func TestAllocator(t *testing.T) {
 	}
 	framework.WaitForFleetCondition(t, flt, e2e.FleetReadyCount(flt.Spec.Replicas))
 	gsa := &v1alpha1.GameServerAllocation{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: defaultNs,
+		},
 		Spec: v1alpha1.GameServerAllocationSpec{
 			Required: metav1.LabelSelector{MatchLabels: map[string]string{stablev1alpha1.FleetNameLabel: flt.ObjectMeta.Name}},
 		}}