Fixed test-install-yaml.

googleforgames · Dec 2, 2018 · fbdb3fa · fbdb3fa
1 parent 435f878
commit fbdb3fa
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 4 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -231,7 +231,7 @@ push-agones-sdk-image: $(ensure-build-image)
 gen-install: $(ensure-build-image)
 	docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) bash -c \
 		'helm template --name=agones-manual --namespace agones-system $(mount_path)/install/helm/agones \
-		--set agones.controller.generateTLS=false \
+		--set agones.controller.generateTLS=false --set agones.enableHelmCleanupHooks=false \
 		> $(mount_path)/install/yaml/install.yaml'
 
 # Generate the SDK gRPC server and client code

diff --git a/install/helm/agones/templates/hooks/post_delete_hook.yaml b/install/helm/agones/templates/hooks/post_delete_hook.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agones.enableHelmCleanupHooks }}
 # Copyright 2018 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,4 +45,5 @@ spec:
       volumes:
       - name: script
         configMap:
-          name: delete-crds
+          name: delete-crds
+{{- end }}
diff --git a/install/helm/agones/templates/hooks/pre_delete_hook.yaml b/install/helm/agones/templates/hooks/pre_delete_hook.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agones.enableHelmCleanupHooks }}
 # Copyright 2018 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,4 +50,5 @@ spec:
       volumes:
       - name: script
         configMap:
-          name: delete-agones-resources
+          name: delete-agones-resources
+{{- end }}
diff --git a/install/helm/agones/templates/hooks/sa.yaml b/install/helm/agones/templates/hooks/sa.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agones.enableHelmCleanupHooks }}
 # Copyright 2018 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -75,3 +76,4 @@ roleRef:
   kind: ClusterRole
   name: helm-hook-cleanup
 {{- end }}
+{{- end }}
diff --git a/install/helm/agones/templates/hooks/scripts.yaml b/install/helm/agones/templates/hooks/scripts.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agones.enableHelmCleanupHooks }}
 # Copyright 2018 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,4 +43,5 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation
 data:
   delete_agones_resources.sh: |
-{{ .Files.Get "scripts/delete_agones_resources.sh" | indent 4 }}
+{{ .Files.Get "scripts/delete_agones_resources.sh" | indent 4 }}
+{{- end }}
diff --git a/install/helm/agones/values.yaml b/install/helm/agones/values.yaml
@@ -16,6 +16,7 @@
 
 agones:
   rbacEnabled: true
+  enableHelmCleanupHooks: true
   serviceaccount:
     controller: agones-controller
     sdk: agones-sdk

diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml
@@ -848,6 +848,18 @@ spec:
         secret:
           secretName: agones-manual-cert
 
+---
+# Source: agones/templates/hooks/post_delete_hook.yaml
+
+---
+# Source: agones/templates/hooks/pre_delete_hook.yaml
+
+---
+# Source: agones/templates/hooks/sa.yaml
+
+---
+# Source: agones/templates/hooks/scripts.yaml
+
 ---
 # Source: agones/templates/admissionregistration.yaml
 # Copyright 2018 Google Inc. All Rights Reserved.