From 8f2890d90eed5cf6c1a162d37d1b55fc2747e37f Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Sat, 22 Jan 2022 09:40:20 -0800 Subject: [PATCH] BOSH release: 2.4.2: fix `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.2.yml | 23 +++++++++++++++++++ docs/DEVELOPER.md | 5 ++-- k8s/Dockerfile-sslip.io-dns-server | 2 +- k8s/document_root/index.html | 2 +- spec/check-dns_spec.rb | 2 +- 9 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 bosh-release/releases/sslip.io/sslip.io-2.4.2.yml diff --git a/bin/make_all b/bin/make_all index 8aa04f9..0c47a8f 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.1 \ +ldflags="-X xip/xip.VersionSemantic=2.4.2 \ -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 3ba0074..3acb522 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 @@ -23,6 +23,10 @@ builds: version: 2da04cb692557030ff9dd8ac08886d38aed0ea612963588e124928c187dc825a blobstore_id: 221ddfff-f5ba-4454-6e35-6e7472e40667 sha1: sha256:05b5ab5272854c80990415278fd4189cbeff913f4e32e220576bcca50185bc1f + 3ee0344f06ba9e7777bee4d8b202979ee2db924ecf200ab0d06b9d974fda17dc: + version: 3ee0344f06ba9e7777bee4d8b202979ee2db924ecf200ab0d06b9d974fda17dc + blobstore_id: 3da727ee-50b3-4cf5-6c9a-18cd0b38a892 + sha1: sha256:ce60c704327d147e66bbcd4e50f359e28ba049b2dd62446625667d9656ceab14 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592: version: 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592 blobstore_id: 46519888-7e72-4a60-6003-45b741bcf5ea diff --git a/bosh-release/packages/sslip.io-dns-server/packaging b/bosh-release/packages/sslip.io-dns-server/packaging index c71f23e..1e27483 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.1 \ +ldflags="-X xip/xip.VersionSemantic=2.4.2 \ -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \ - -X xip/xip.VersionGitHash=64d5832" + -X xip/xip.VersionGitHash=1e6fae4" 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 01667e3..bd76ebe 100644 --- a/bosh-release/releases/sslip.io/index.yml +++ b/bosh-release/releases/sslip.io/index.yml @@ -41,6 +41,8 @@ builds: version: 2.2.4 dbbd518f-f17e-4f92-4878-327817590ec8: version: 2.2.3 + dbe6b32b-d9d3-4ae3-57ad-e44d6ad394eb: + version: 2.4.2 f9e9294d-f36a-4f2a-57c9-66db30679487: version: 2.4.0 format-version: "2" diff --git a/bosh-release/releases/sslip.io/sslip.io-2.4.2.yml b/bosh-release/releases/sslip.io/sslip.io-2.4.2.yml new file mode 100644 index 0000000..a7a4ed8 --- /dev/null +++ b/bosh-release/releases/sslip.io/sslip.io-2.4.2.yml @@ -0,0 +1,23 @@ +name: sslip.io +version: 2.4.2 +commit_hash: a7086b9 +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: 3ee0344f06ba9e7777bee4d8b202979ee2db924ecf200ab0d06b9d974fda17dc + fingerprint: 3ee0344f06ba9e7777bee4d8b202979ee2db924ecf200ab0d06b9d974fda17dc + sha1: sha256:ce60c704327d147e66bbcd4e50f359e28ba049b2dd62446625667d9656ceab14 + dependencies: + - golang-1-linux diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index aba774d..e567754 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -28,7 +28,7 @@ bosh create-release --force bosh upload-release bosh -n -d sslip.io-dns-server deploy ~/workspace/deployments/sslip.io-dns-server.yml --recreate bosh instances # record the IP address of the instance -IP=10.0.250.22 +IP=$(bosh is --json | jq -r '.Tables[0].Rows[0].ips') dig +short 127.0.0.1.example.com @$IP echo 127.0.0.1 dig +short ns example.com @$IP @@ -63,7 +63,8 @@ dig @$IP delete.my-key.k-v.io txt +short echo "\"MyValue\"" echo " ===" # separator because the results are too similar dig @$IP my-key.k-v.io txt +short # returns nothing -dig @$IP metrics.status.sslip.io txt +short +dig @$IP metrics.status.sslip.io txt +short | grep '"queries: ' +echo '"queries: 16"' pushd .. git add -p git ci -vm"BOSH release: $VERSION: kv.sslip.io key-value store" diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server index eb2affd..5c097ba 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.1/sslip.io-dns-server-linux-$TARGETARCH \ +RUN wget https://github.com/cunnie/sslip.io/releases/download/2.4.2/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 e261f02..03576bd 100644 --- a/k8s/document_root/index.html +++ b/k8s/document_root/index.html @@ -156,7 +156,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.4.1/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.4.2/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 c371bf2..4691c52 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.1'
+sslip_version = '2.4.2'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do