From b6d6c860a56120e94c47008ea8cafb42ff178ea1 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Thu, 1 Sep 2022 12:44:20 +0000
Subject: [PATCH 1/5] Use netgo when building (#1001)

---
 .goreleaser.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 96210a3618..7cb56c7c2c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,7 +13,7 @@ builds:
     goarch:
       - amd64
     flags:
-      - -tags=assets
+      - -tags=assets,netgo
       - -trimpath
 
 sboms:

From c761b6f399a90d5e7af99bd3c89c195f98d7a19e Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Thu, 1 Sep 2022 08:49:26 -0400
Subject: [PATCH 2/5] Update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37ca7f8cff..638674a8a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.9.1](https://github.com/markphelps/flipt/releases/tag/v1.9.1) - 2022-09-01
+
+### Fixed
+
+- Issue when not using `netgo` build tag during build, resulting in native dns resolution not working for some cases in k8s. See  [https://github.com/flipt-io/flipt/issues/993](https://github.com/flipt-io/flipt/issues/993).
+
+### Changed
+
 ## [v1.9.0](https://github.com/markphelps/flipt/releases/tag/v1.9.0) - 2022-07-06
 
 ### Changed

From 460dbdbad42d4c65984a4bbf61b5138ba97969af Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Thu, 1 Sep 2022 09:17:22 -0400
Subject: [PATCH 3/5] Fix release workflow

---
 .github/workflows/release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cc244dbfd0..4c9b78105c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,8 @@
 name: Release
 on:
+  push:
+    tags:
+      - "v*"
   workflow_dispatch:
 
 permissions:

From cab0f2d16398d6793a7238a67fb62917a1c9db55 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Thu, 1 Sep 2022 09:25:07 -0400
Subject: [PATCH 4/5] Fix docker image names

---
 .goreleaser.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 7cb56c7c2c..1465093c6c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -40,10 +40,12 @@ dockers:
   - dockerfile: ./build/Dockerfile
     use: buildx
     image_templates:
-      - "markphelps/flipt:latest"
-      - "markphelps/flipt:{{ .Tag }}"
-      - "ghcr.io/markphelps/flipt:latest"
-      - "ghcr.io/markphelps/flipt:{{ .Tag }}"
+      - "flipt/flipt:latest"
+      - "flipt/flipt:{{ .Tag }}"
+      - "markphelps/flipt:latest" # TODO: deprecate
+      - "markphelps/flipt:{{ .Tag }}" # TODO: deprecate
+      - "ghcr.io/flipt-io/flipt:latest"
+      - "ghcr.io/flipt-io/flipt:{{ .Tag }}"
     build_flag_templates:
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"

From f29782fba0a2fcedd211044a10d3055436d932a9 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Thu, 1 Sep 2022 09:26:41 -0400
Subject: [PATCH 5/5] Update Changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25d774a049..cce06295a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.10.1](https://github.com/markphelps/flipt/releases/tag/v1.10.1) - 2022-09-01
+
+### Fixed
+
+- (Ported from v1.9.1) Issue when not using `netgo` build tag during build, resulting in native dns resolution not working for some cases in k8s. See  [https://github.com/flipt-io/flipt/issues/993](https://github.com/flipt-io/flipt/issues/993).
+
 ## [v1.10.0](https://github.com/markphelps/flipt/releases/tag/v1.10.0) - 2022-07-27
 
 ### Added