From 4e2212311435bc4e2257d2698fce53811fea06e1 Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Sat, 27 Nov 2021 11:32:50 -0800 Subject: [PATCH] BOSH release: 2.2.3: Include sslip.io nameservers --- .../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.2.3.yml | 23 +++++++++++++++++++ docs/DEVELOPER.md | 8 +++---- k8s/Dockerfile-sslip.io-dns-server | 2 +- k8s/document_root/index.html | 2 +- spec/check-dns_spec.rb | 2 +- 8 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 bosh-release/releases/sslip.io/sslip.io-2.2.3.yml 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 3056505..428ddab 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 @@ -15,6 +15,10 @@ builds: version: 2da04cb692557030ff9dd8ac08886d38aed0ea612963588e124928c187dc825a blobstore_id: 221ddfff-f5ba-4454-6e35-6e7472e40667 sha1: sha256:05b5ab5272854c80990415278fd4189cbeff913f4e32e220576bcca50185bc1f + 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592: + version: 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592 + blobstore_id: 46519888-7e72-4a60-6003-45b741bcf5ea + sha1: sha256:c4a01f3e4b65d9322b5f76aa12cc774056781b864716cff1b43471f77bc34169 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba: version: 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba blobstore_id: 79a8e95c-3ae3-4626-54df-a56a9a867def diff --git a/bosh-release/packages/sslip.io-dns-server/packaging b/bosh-release/packages/sslip.io-dns-server/packaging index 2a64b1a..6341228 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.2.2 \ +ldflags="-X xip/xip.VersionSemantic=2.2.3 \ -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \ - -X xip/xip.VersionGitHash=30d2c8a" + -X xip/xip.VersionGitHash=b0f6805" 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 3db80ea..f1d38df 100644 --- a/bosh-release/releases/sslip.io/index.yml +++ b/bosh-release/releases/sslip.io/index.yml @@ -33,4 +33,6 @@ builds: version: 1.1.2 d1f0f246-7316-49b9-7620-e9900d9e791e: version: 1.1.0 + dbbd518f-f17e-4f92-4878-327817590ec8: + version: 2.2.3 format-version: "2" diff --git a/bosh-release/releases/sslip.io/sslip.io-2.2.3.yml b/bosh-release/releases/sslip.io/sslip.io-2.2.3.yml new file mode 100644 index 0000000..26c26dd --- /dev/null +++ b/bosh-release/releases/sslip.io/sslip.io-2.2.3.yml @@ -0,0 +1,23 @@ +name: sslip.io +version: 2.2.3 +commit_hash: 0b2eb6c +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: 92655dbac2d36906f0d761ab03f2eb6bfa9a22730d8f1591a1acb7a6de875ed4 + fingerprint: 92655dbac2d36906f0d761ab03f2eb6bfa9a22730d8f1591a1acb7a6de875ed4 + sha1: sha256:e09c7eb7e88462113fdf2095d1ab0d4b9aed0dfd26cdda19744a47f006f6fe7c + dependencies: [] +- name: sslip.io-dns-server + version: 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592 + fingerprint: 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592 + sha1: sha256:c4a01f3e4b65d9322b5f76aa12cc774056781b864716cff1b43471f77bc34169 + dependencies: + - golang-1-linux diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index f427f9b..666ddec 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. ```zsh -export OLD_VERSION=2.2.1 -export VERSION=2.2.2 +export OLD_VERSION=2.2.2 +export VERSION=2.2.3 cd ~/workspace/sslip.io git pull -r --autostash # update the version number for the TXT record for version.sslip.io @@ -32,7 +32,7 @@ IP=10.0.250.3 dig +short 127.0.0.1.example.com @$IP echo 127.0.0.1 dig +short ns example.com @$IP -printf "ns-aws.nono.io.\nns-azure.nono.io.\nns-gce.nono.io.\n" +printf "ns-aws.nono.io.\nns-azure.nono.io.\nns-gce.nono.io.ns-aws.sslip.io.\nns-azure.sslip.io.\nns-gce.sslip.io.\n" dig +short mx example.com @$IP echo "0 example.com." dig +short mx sslip.io @$IP @@ -52,7 +52,7 @@ curl curlmyip.org; echo dig @$IP txt version.sslip.io +short | grep $VERSION echo "\"$VERSION\"" git add -p -git ci -vm"BOSH release: 2.2.2: TXT records return IP addrs" +git ci -vm"BOSH release: $VERSION: Include sslip.io nameservers" bosh upload-blobs bosh create-release \ --final \ diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server index 480a0d9..6e9e25f 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.2.2/sslip.io-dns-server-linux-$TARGETARCH \ +RUN wget https://github.com/cunnie/sslip.io/releases/download/2.2.3/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 4a5a39e..9ab2ee0 100644 --- a/k8s/document_root/index.html +++ b/k8s/document_root/index.html @@ -160,7 +160,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"> 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.2.2/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.2.3/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 99960c5..de22897 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.2.2'
+sslip_version = '2.2.3'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do