diff --git a/install/helm/agones/templates/serviceaccounts/controller.yaml b/install/helm/agones/templates/serviceaccounts/controller.yaml index 2e4ddeef29..bc2bacd782 100644 --- a/install/helm/agones/templates/serviceaccounts/controller.yaml +++ b/install/helm/agones/templates/serviceaccounts/controller.yaml @@ -44,7 +44,7 @@ rules: resources: ["pods"] verbs: ["create", "delete", "list", "watch"] - apiGroups: [""] - resources: ["nodes"] + resources: ["nodes", "secrets"] verbs: ["list", "watch"] - apiGroups: ["apiextensions.k8s.io"] resources: ["customresourcedefinitions"] @@ -65,6 +65,7 @@ rules: resources: ["gameserverallocationpolicies"] verbs: ["create", "delete", "get", "list", "update", "watch"] + --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml index 70cfef1559..dd72c6a475 100644 --- a/install/yaml/install.yaml +++ b/install/yaml/install.yaml @@ -42,7 +42,7 @@ rules: resources: ["pods"] verbs: ["create", "delete", "list", "watch"] - apiGroups: [""] - resources: ["nodes"] + resources: ["nodes", "secrets"] verbs: ["list", "watch"] - apiGroups: ["apiextensions.k8s.io"] resources: ["customresourcedefinitions"] @@ -63,6 +63,7 @@ rules: resources: ["gameserverallocationpolicies"] verbs: ["create", "delete", "get", "list", "update", "watch"] + --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/pkg/gameserverallocations/controller.go b/pkg/gameserverallocations/controller.go index d1c2c1f9d3..e4a547b30f 100644 --- a/pkg/gameserverallocations/controller.go +++ b/pkg/gameserverallocations/controller.go @@ -70,9 +70,9 @@ var ( ) const ( - secretClientCertName = "client-cert" - secretClientKeyName = "client-key" - secretCaCertName = "ca-cert" + secretClientCertName = "client.crt" + secretClientKeyName = "client.key" + secretCaCertName = "ca.crt" ) // Controller is a the GameServerAllocation controller @@ -375,6 +375,7 @@ func (c *Controller) allocateFromRemoteCluster(gsa v1alpha1.GameServerAllocation return nil, err } if response.StatusCode >= 400 { + // For error responses return the body without deserializing to an object. return nil, errors.New(string(data)) } diff --git a/pkg/gameserverallocations/controller_test.go b/pkg/gameserverallocations/controller_test.go index c8ec32910d..5773a9b926 100644 --- a/pkg/gameserverallocations/controller_test.go +++ b/pkg/gameserverallocations/controller_test.go @@ -1014,7 +1014,7 @@ func TestCreateRestClientError(t *testing.T) { return true, &corev1.SecretList{ Items: []corev1.Secret{{ Data: map[string][]byte{ - "client-cert": clientCert, + "client.crt": clientCert, }, ObjectMeta: metav1.ObjectMeta{ Name: "secret-name", @@ -1038,8 +1038,8 @@ func TestCreateRestClientError(t *testing.T) { return true, &corev1.SecretList{ Items: []corev1.Secret{{ Data: map[string][]byte{ - "client-cert": []byte("XXX"), - "client-key": []byte("XXX"), + "client.crt": []byte("XXX"), + "client.key": []byte("XXX"), }, ObjectMeta: metav1.ObjectMeta{ Name: "secret-name", @@ -1159,9 +1159,9 @@ func getTestSecret(secretName string, serverCert []byte) *corev1.SecretList { Items: []corev1.Secret{ { Data: map[string][]byte{ - "ca-cert": serverCert, - "client-key": clientKey, - "client-cert": clientCert, + "ca.crt": serverCert, + "client.key": clientKey, + "client.crt": clientCert, }, ObjectMeta: metav1.ObjectMeta{ Name: secretName, diff --git a/site/content/en/docs/Reference/agones_crd_api_reference.html b/site/content/en/docs/Reference/agones_crd_api_reference.html index d781b7f9b0..8083ed8845 100644 --- a/site/content/en/docs/Reference/agones_crd_api_reference.html +++ b/site/content/en/docs/Reference/agones_crd_api_reference.html @@ -2227,6 +2227,8 @@

WebhookPolicy + + {{% feature publishVersion="0.10.0" %}}

Packages: