From 14ef9a04e9576f401be97b6e35c97524aeb68428 Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Thu, 20 Jan 2022 08:08:52 -0800 Subject: [PATCH] BOSH release: 2.4.1: fewer panics customized records w/ non-existent TXTs don't panic(). --- bin/make_all | 2 +- .../packages/sslip.io-dns-server/index.yml | 4 ++++ .../packages/sslip.io-dns-server/packaging | 4 ++-- bosh-release/releases/sslip.io/index.yml | 2 ++ .../releases/sslip.io/sslip.io-2.4.1.yml | 23 +++++++++++++++++++ docs/DEVELOPER.md | 4 ++-- k8s/Dockerfile-sslip.io-dns-server | 2 +- k8s/document_root/index.html | 2 +- spec/check-dns_spec.rb | 2 +- 9 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 bosh-release/releases/sslip.io/sslip.io-2.4.1.yml diff --git a/bin/make_all b/bin/make_all index 8fbe6d04..8aa04f94 100755 --- a/bin/make_all +++ b/bin/make_all @@ -4,7 +4,7 @@ # DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd $DIR/../src/sslip.io-dns-server -ldflags="-X xip/xip.VersionSemantic=2.4.0 \ +ldflags="-X xip/xip.VersionSemantic=2.4.1 \ -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \ -X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)" export GOOS GOARCH diff --git a/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml b/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml index 0f02ac1f..3ba0074c 100644 --- a/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml +++ b/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml @@ -1,4 +1,8 @@ builds: + 01bf74d1f8706d5ee06a3d35e20064a6e2310b509ec5168dc61e381149f2c9f9: + version: 01bf74d1f8706d5ee06a3d35e20064a6e2310b509ec5168dc61e381149f2c9f9 + blobstore_id: fa32b6c6-b646-4399-5f96-9ae00aec6c65 + sha1: sha256:345b69c95b2c4f2b8533935ac11107d1598b24231179ec9c5b1aff080c8b6960 037e9cbd3401e13b101d8345ed35dd9f11e677d1a8ad32f61bd390c732b1f9b6: version: 037e9cbd3401e13b101d8345ed35dd9f11e677d1a8ad32f61bd390c732b1f9b6 blobstore_id: d07828f0-f4ff-4966-7a52-fa25d3eba096 diff --git a/bosh-release/packages/sslip.io-dns-server/packaging b/bosh-release/packages/sslip.io-dns-server/packaging index 1382553f..c71f23ec 100644 --- a/bosh-release/packages/sslip.io-dns-server/packaging +++ b/bosh-release/packages/sslip.io-dns-server/packaging @@ -5,9 +5,9 @@ source /var/vcap/packages/golang-1-linux/bosh/compile.env mkdir src ${BOSH_INSTALL_TARGET}/bin mv sslip.io-dns-server/{go.*,main.go,xip} src/ cd src/ -ldflags="-X xip/xip.VersionSemantic=2.4.0 \ +ldflags="-X xip/xip.VersionSemantic=2.4.1 \ -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \ - -X xip/xip.VersionGitHash=916e89c" + -X xip/xip.VersionGitHash=64d5832" go build \ -ldflags="$ldflags" \ -o ${BOSH_INSTALL_TARGET}/bin/sslip.io-dns-server diff --git a/bosh-release/releases/sslip.io/index.yml b/bosh-release/releases/sslip.io/index.yml index 1dea4af2..01667e31 100644 --- a/bosh-release/releases/sslip.io/index.yml +++ b/bosh-release/releases/sslip.io/index.yml @@ -1,6 +1,8 @@ builds: 1c4de423-584b-42b9-59ab-93a123c96307: version: 1.2.0 + 43640b61-afe3-4bc0-79ed-4e279f286041: + version: 2.4.1 516ea48d-0717-494d-4082-9d8f0ab937df: version: 1.3.1 520c044f-c0d0-4fd8-72a4-ed482efa2a96: diff --git a/bosh-release/releases/sslip.io/sslip.io-2.4.1.yml b/bosh-release/releases/sslip.io/sslip.io-2.4.1.yml new file mode 100644 index 00000000..b9515b9f --- /dev/null +++ b/bosh-release/releases/sslip.io/sslip.io-2.4.1.yml @@ -0,0 +1,23 @@ +name: sslip.io +version: 2.4.1 +commit_hash: f86f6f0 +uncommitted_changes: false +jobs: +- name: sslip.io-dns-server + version: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9 + fingerprint: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9 + sha1: sha256:6ca6f2c11816a82ecb3cf9300ea59369977cbaa7c39eddca35628a7c6b9b5b45 + packages: + - sslip.io-dns-server +packages: +- name: golang-1-linux + version: 1ab563903c1f130ca908d3abdbf66650a395d3b77134474bff837aeed3649c06 + fingerprint: 1ab563903c1f130ca908d3abdbf66650a395d3b77134474bff837aeed3649c06 + sha1: sha256:1f4f73a903b8f59b46d9a8ff813961615126b843eafa991c7dc950ae9a2a0bf1 + dependencies: [] +- name: sslip.io-dns-server + version: 01bf74d1f8706d5ee06a3d35e20064a6e2310b509ec5168dc61e381149f2c9f9 + fingerprint: 01bf74d1f8706d5ee06a3d35e20064a6e2310b509ec5168dc61e381149f2c9f9 + sha1: sha256:345b69c95b2c4f2b8533935ac11107d1598b24231179ec9c5b1aff080c8b6960 + dependencies: + - golang-1-linux diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index e499fe27..508cfd95 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -4,8 +4,8 @@ These instructions are meant primarily for me when deploying a new BOSH release; they might not make sense unless you're on my workstation. ```bash -export OLD_VERSION=2.3.0 -export VERSION=2.4.0 +export OLD_VERSION=2.4.0 +export VERSION=2.4.1 cd ~/workspace/sslip.io git pull -r --autostash # update the version number for the TXT record for version.status.sslip.io diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server index c9953bca..eb2affde 100644 --- a/k8s/Dockerfile-sslip.io-dns-server +++ b/k8s/Dockerfile-sslip.io-dns-server @@ -26,7 +26,7 @@ LABEL maintainer="brian.cunnie@gmail.com" RUN apk update && apk add bind-tools ARG TARGETARCH # amd64, arm64 (so I can run on AWS graviton2) -RUN wget https://github.com/cunnie/sslip.io/releases/download/2.4.0/sslip.io-dns-server-linux-$TARGETARCH \ +RUN wget https://github.com/cunnie/sslip.io/releases/download/2.4.1/sslip.io-dns-server-linux-$TARGETARCH \ -O /usr/sbin/sslip.io-dns-server; \ chmod 755 /usr/sbin/sslip.io-dns-server diff --git a/k8s/document_root/index.html b/k8s/document_root/index.html index 0bfcc7e4..17a9549e 100644 --- a/k8s/document_root/index.html +++ b/k8s/document_root/index.html @@ -156,7 +156,7 @@

But I Want My Own DNS Server!

example, we install & run our server within a docker container:

 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/2.4.0/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.4.1/sslip.io-dns-server-linux-amd64 -o dns-server
 chmod +x dns-server
 ./dns-server 2> dns-server.log &
 dnf install -y bind-utils
diff --git a/spec/check-dns_spec.rb b/spec/check-dns_spec.rb
index 70531576..d35ce6e8 100644
--- a/spec/check-dns_spec.rb
+++ b/spec/check-dns_spec.rb
@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
 end
 
 domain = ENV['DOMAIN'] || 'example.com'
-sslip_version = '2.4.0'
+sslip_version = '2.4.1'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do