From 50c46581b38a04641566813d9a2dd77f64db1ee9 Mon Sep 17 00:00:00 2001
From: Chris Stephen <chris.stephen@circleci.com>
Date: Thu, 23 Nov 2023 11:25:03 -0400
Subject: [PATCH] Add finalizer on GatewayClass to ensure proper cleanup (#33)

* Add finalizer on GatewayClass to ensure proper cleanup

* Bump version and update changelog
---
 Chart.yaml                            | 2 +-
 README.md                             | 2 +-
 changelog.md                          | 4 ++++
 templates/ssh.yaml                    | 2 ++
 tests/__snapshot__/ssh_test.yaml.snap | 2 ++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index c8075cb..99a9043 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -4,5 +4,5 @@ description: For deploying a CircleCI Container Agent
 icon: https://raw.githubusercontent.com/circleci/media/master/logo/build/horizontal_dark.1.png
 type: application
 
-version: "101.0.12"
+version: "101.0.13"
 appVersion: "3"
diff --git a/README.md b/README.md
index cd3c24e..78e655b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 For deploying a CircleCI Container Agent
 
-![Version: 101.0.12](https://img.shields.io/badge/Version-101.0.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3](https://img.shields.io/badge/AppVersion-3-informational?style=flat-square)
+![Version: 101.0.13](https://img.shields.io/badge/Version-101.0.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3](https://img.shields.io/badge/AppVersion-3-informational?style=flat-square)
 
 ## Contributing
 
diff --git a/changelog.md b/changelog.md
index d7de969..30c2ae1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,10 @@
 
 This is the Container Agent Helm Chart changelog
 
+# 101.0.13
+
+- [#32](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/32) Add finalizer on GatewayClass to ensure proper cleanup
+
 # 101.0.12
 
 - [#31](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/31) Fixed PDB to reference the right variable
diff --git a/templates/ssh.yaml b/templates/ssh.yaml
index 8c294b5..d3c7c20 100644
--- a/templates/ssh.yaml
+++ b/templates/ssh.yaml
@@ -10,6 +10,8 @@ kind: GatewayClass
 metadata:
   name: {{ $name }}
   namespace: {{ $namespace }}
+  finalizers:
+    - gateway-exists-finalizer.gateway.networking.k8s.io
 spec:
   controllerName: {{ .Values.agent.ssh.controllerName }}
   {{- with .Values.agent.ssh.parametersRef }}
diff --git a/tests/__snapshot__/ssh_test.yaml.snap b/tests/__snapshot__/ssh_test.yaml.snap
index b9e8477..d32d7f6 100644
--- a/tests/__snapshot__/ssh_test.yaml.snap
+++ b/tests/__snapshot__/ssh_test.yaml.snap
@@ -3,6 +3,8 @@ should create Gateway and Service resources if enabled:
     apiVersion: gateway.networking.k8s.io/v1
     kind: GatewayClass
     metadata:
+      finalizers:
+        - gateway-exists-finalizer.gateway.networking.k8s.io
       name: RELEASE-NAME-container-agent-ssh
       namespace: NAMESPACE
     spec: