From bd63421c3ff7c344b13d9084a05a17641b2b6be6 Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Sat, 4 Dec 2021 08:14:43 -0800 Subject: [PATCH] BOSH release: 2.3.0: kv.sslip.io key-value store --- 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.3.0.yml | 23 +++++++++++++++++++ docs/DEVELOPER.md | 20 ++++++++++++---- k8s/Dockerfile-sslip.io-dns-server | 2 +- k8s/document_root/index.html | 2 +- spec/check-dns_spec.rb | 2 +- 9 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 bosh-release/releases/sslip.io/sslip.io-2.3.0.yml diff --git a/bin/make_all b/bin/make_all index 4757055..54f904b 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.2.4 \ +ldflags="-X xip/xip.VersionSemantic=2.3.0 \ -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 43a9122..5ce0997 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 @@ -27,6 +27,10 @@ builds: version: 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba blobstore_id: 79a8e95c-3ae3-4626-54df-a56a9a867def sha1: sha256:5e44389f55dceb9012beee90721ff02d38c73e7922c6872129b3eae332a407e3 + 663565b31241fbac61a1cf3e756b573103d15cc541676e7076cbb24affc4cb16: + version: 663565b31241fbac61a1cf3e756b573103d15cc541676e7076cbb24affc4cb16 + blobstore_id: a68337ca-1c9e-4597-485d-2ee9f081c3b5 + sha1: sha256:7f4a32260a0d254ba9bbbdb4ad9f42618e600579618acd60dd23a8f45b783f04 786561e90d2c832e021fdf46fc75aad34c66abd32e776f74b4130f7ae2427b67: version: 786561e90d2c832e021fdf46fc75aad34c66abd32e776f74b4130f7ae2427b67 blobstore_id: f81ff453-5d1d-45c3-5e96-0147611a2bee diff --git a/bosh-release/packages/sslip.io-dns-server/packaging b/bosh-release/packages/sslip.io-dns-server/packaging index 6e3029a..1b0abf4 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.4 \ +ldflags="-X xip/xip.VersionSemantic=2.3.0 \ -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \ - -X xip/xip.VersionGitHash=4b0bd69" + -X xip/xip.VersionGitHash=84ffaee" 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 f5f57a8..085b46f 100644 --- a/bosh-release/releases/sslip.io/index.yml +++ b/bosh-release/releases/sslip.io/index.yml @@ -5,6 +5,8 @@ builds: version: 1.3.1 520c044f-c0d0-4fd8-72a4-ed482efa2a96: version: 1.3.0 + 5a0e2878-cc0e-4daf-4977-724451ad9855: + version: 2.3.0 623b429d-bb4e-4064-5dd2-bf8287e6854b: version: 2.1.1 6f328239-8642-475a-4bf7-e64fd6e7cb31: diff --git a/bosh-release/releases/sslip.io/sslip.io-2.3.0.yml b/bosh-release/releases/sslip.io/sslip.io-2.3.0.yml new file mode 100644 index 0000000..61d1e30 --- /dev/null +++ b/bosh-release/releases/sslip.io/sslip.io-2.3.0.yml @@ -0,0 +1,23 @@ +name: sslip.io +version: 2.3.0 +commit_hash: 6a22928 +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: 663565b31241fbac61a1cf3e756b573103d15cc541676e7076cbb24affc4cb16 + fingerprint: 663565b31241fbac61a1cf3e756b573103d15cc541676e7076cbb24affc4cb16 + sha1: sha256:7f4a32260a0d254ba9bbbdb4ad9f42618e600579618acd60dd23a8f45b783f04 + dependencies: + - golang-1-linux diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index 0f5b4e9..ca2bff2 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.2.3 -export VERSION=2.2.4 +export OLD_VERSION=2.2.4 +export VERSION=2.3.0 cd ~/workspace/sslip.io git pull -r --autostash # update the version number for the TXT record for version.sslip.io @@ -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.3 +IP=10.0.250.22 dig +short 127.0.0.1.example.com @$IP echo 127.0.0.1 dig +short ns example.com @$IP @@ -51,9 +51,21 @@ dig @$IP txt ip.sslip.io +short | tr -d '"' curl curlmyip.org; echo dig @$IP txt version.sslip.io +short | grep $VERSION echo "\"$VERSION\"" +dig @$IP my-key.kv.sslip.io txt +short # returns nothing +echo " ===" # separator because the results are too similar +dig @$IP put.MyValue.my-key.kv.sslip.io txt +short +echo "\"MyValue\"" +echo " ===" # separator because the results are too similar +dig @$IP MY-KEY.kv.sslip.io txt +short +echo "\"MyValue\"" +echo " ===" # separator because the results are too similar +dig @$IP delete.my-key.kv.sslip.io txt +short +echo "\"MyValue\"" +echo " ===" # separator because the results are too similar +dig @$IP my-key.kv.sslip.io txt +short # returns nothing pushd .. git add -p -git ci -vm"BOSH release: $VERSION: Deprecate nono.io nameservers" +git ci -vm"BOSH release: $VERSION: kv.sslip.io key-value store" popd bosh upload-blobs bosh create-release \ diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server index e03b143..79f5084 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.4/sslip.io-dns-server-linux-$TARGETARCH \ +RUN wget https://github.com/cunnie/sslip.io/releases/download/2.3.0/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 db026f9..588fd22 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.2.4/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.3.0/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 96275b8..4471ad0 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.4'
+sslip_version = '2.3.0'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do