Compare commits

..

No commits in common. "735f9b444253a8225682de550ec82bc9cee057d8" and "d7bda0d703861cc4afe2f424a8206d12b1dbfd7c" have entirely different histories.

3 changed files with 6 additions and 68 deletions

View File

@ -7,7 +7,6 @@ REGION := sfo3
ROOT_DIR := $(shell pwd) ROOT_DIR := $(shell pwd)
TERRAFORM := $(ROOT_DIR)/out/terraform TERRAFORM := $(ROOT_DIR)/out/terraform
SOPS := $(ROOT_DIR)/out/sops SOPS := $(ROOT_DIR)/out/sops
GO := cache/fetch/go/bin/go
KEYS := \ KEYS := \
6B61ECD76088748C70590D55E90A401336C8AAA9 \ 6B61ECD76088748C70590D55E90A401336C8AAA9 \
88823A75ECAA786B0FF38B148E401478A3FBEF72 \ 88823A75ECAA786B0FF38B148E401478A3FBEF72 \
@ -112,15 +111,6 @@ apply: \
$(CACHE_DIR)/secrets: $(CACHE_DIR)/secrets:
mkdir -p $@ mkdir -p $@
$(FETCH_DIR)/go:
mkdir -p $@ $@.tmp
wget https://go.dev/dl/$(GO_VERSION).src.tar.gz -O $@.tmp/$(GO_VERSION).src.tar.gz
echo "$(GO_HASH) $@.tmp/$(GO_VERSION).src.tar.gz" | sha256sum --strict --check -
# Verify tar file is still in same format from 1.20.x
tar -x go/VERSION -f $@.tmp/$(GO_VERSION).src.tar.gz -O > /dev/null
tar -xf $@.tmp/$(GO_VERSION).src.tar.gz -C $(FETCH_DIR)
rm -r $@.tmp
$(FETCH_DIR)/terraform: $(FETCH_DIR)/terraform:
$(call git_clone,$@,$(TERRAFORM_REPO),$(TERRAFORM_REF)) $(call git_clone,$@,$(TERRAFORM_REPO),$(TERRAFORM_REF))
@ -130,84 +120,46 @@ $(FETCH_DIR)/sops:
$(FETCH_DIR)/talosctl: $(FETCH_DIR)/talosctl:
$(call git_clone,$@,$(TALOSCTL_REPO),$(TALOSCTL_REF)) $(call git_clone,$@,$(TALOSCTL_REPO),$(TALOSCTL_REF))
$(FETCH_DIR)/kubectl: $(OUT_DIR)/terraform: $(FETCH_DIR)/terraform
$(call git_clone,$@,$(KUBECTL_REPO),$(KUBECTL_REF))
$(FETCH_DIR)/kustomize:
$(call git_clone,$@,$(KUSTOMIZE_REPO),$(KUSTOMIZE_REF))
$(FETCH_DIR)/go/bin/go: $(FETCH_DIR)/go
$(call toolchain," \
cd $(FETCH_DIR)/go/src && \
./make.bash \
")
$(OUT_DIR)/terraform: $(FETCH_DIR)/terraform $(GO)
$(call toolchain," \ $(call toolchain," \
cd $(FETCH_DIR)/terraform && \ cd $(FETCH_DIR)/terraform && \
export SSL_CERT_DIR=/etc/ssl/certs && \ export SSL_CERT_DIR=/etc/ssl/certs && \
export CGO_ENABLED=0 && \ export CGO_ENABLED=0 && \
export GOCACHE=/home/build/$(CACHE_DIR) && \ export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \ export GOPATH=/home/build/$(CACHE_DIR) && \
/home/build/$(GO) build \ go build \
-v \ -v \
-trimpath \ -trimpath \
-ldflags='-w -extldflags=-static' \ -ldflags='-w -extldflags=-static' \
-o /home/build/$@ \ -o /home/build/$@ \
") ")
$(OUT_DIR)/sops: $(FETCH_DIR)/sops $(GO) $(OUT_DIR)/sops: $(FETCH_DIR)/sops
$(call toolchain," \ $(call toolchain," \
cd $(FETCH_DIR)/sops && \ cd $(FETCH_DIR)/sops && \
export CGO_ENABLED=0 && \ export CGO_ENABLED=0 && \
export GOCACHE=/home/build/$(CACHE_DIR) && \ export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \ export GOPATH=/home/build/$(CACHE_DIR) && \
/home/build/$(GO) build \ go build \
-v \ -v \
-trimpath \ -trimpath \
-ldflags='-w -extldflags=-static' \ -ldflags='-w -extldflags=-static' \
-o /home/build/$@ $(SOPS_PKG) \ -o /home/build/$@ $(SOPS_PKG) \
") ")
$(OUT_DIR)/talosctl: $(FETCH_DIR)/talosctl $(GO) $(OUT_DIR)/talosctl: $(FETCH_DIR)/talosctl
$(call toolchain," \ $(call toolchain," \
cd $(FETCH_DIR)/talosctl && \ cd $(FETCH_DIR)/talosctl && \
export CGO_ENABLED=0 && \ export CGO_ENABLED=0 && \
export GOCACHE=/home/build/$(CACHE_DIR) && \ export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \ export GOPATH=/home/build/$(CACHE_DIR) && \
/home/build/$(GO) build \ go build \
-v \ -v \
-trimpath \ -trimpath \
-ldflags='-w -extldflags=-static' \ -ldflags='-w -extldflags=-static' \
-o /home/build/$@ $(TALOSCTL_PKG) \ -o /home/build/$@ $(TALOSCTL_PKG) \
") ")
$(OUT_DIR)/kubectl: $(FETCH_DIR)/kubectl $(GO)
$(call toolchain," \
cd $(FETCH_DIR)/kubectl && \
export CGO_ENABLED=0 && \
export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \
/home/build/$(GO) build \
-v \
-trimpath \
-ldflags='-w -extldflags=-static' \
-o /home/build/$@ $(KUBECTL_PKG) \
")
$(OUT_DIR)/kustomize: $(FETCH_DIR)/kustomize $(GO)
$(call toolchain," \
cd $(FETCH_DIR)/kustomize && \
export CGO_ENABLED=0 && \
export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \
/home/build/$(GO) build \
-v \
-trimpath \
-ldflags='-w -extldflags=-static' \
-o /home/build/$@ $(KUSTOMIZE_PKG) \
")
# Note: Decryption MUST reset the mod time to avoid encryption/decryption loops # Note: Decryption MUST reset the mod time to avoid encryption/decryption loops
# Encrypt if: # Encrypt if:
# - Both files exist, local is newer than remote # - Both files exist, local is newer than remote

View File

@ -6,7 +6,6 @@ For the purpose of transparency, we include our infrastructure configuration rig
* Docker * Docker
* GNU Make * GNU Make
* wget
## Usage ## Usage

View File

@ -1,6 +1,4 @@
DEBIAN_HASH=f9e970d357981f7f5055f89365af980534ce742fc11480c51f929da83aa15980 DEBIAN_HASH=f9e970d357981f7f5055f89365af980534ce742fc11480c51f929da83aa15980
GO_VERSION=go1.20.4
GO_HASH=9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
TERRAFORM_REF=6c2c6cfa1b55bd6ff4cf4e26ef86d8d7ab0465ec TERRAFORM_REF=6c2c6cfa1b55bd6ff4cf4e26ef86d8d7ab0465ec
TERRAFORM_REPO=https://github.com/hashicorp/terraform TERRAFORM_REPO=https://github.com/hashicorp/terraform
SOPS_REF=86f500de6102f5219e3fd0a25c718db01a7d39ed SOPS_REF=86f500de6102f5219e3fd0a25c718db01a7d39ed
@ -9,14 +7,3 @@ SOPS_PKG=go.mozilla.org/sops/v3/cmd/sops
TALOSCTL_REF=a2cc92b8a54e42fc2554d49e4e2147a57fba69cb TALOSCTL_REF=a2cc92b8a54e42fc2554d49e4e2147a57fba69cb
TALOSCTL_REPO=https://github.com/siderolabs/talos TALOSCTL_REPO=https://github.com/siderolabs/talos
TALOSCTL_PKG=github.com/siderolabs/talos/cmd/talosctl TALOSCTL_PKG=github.com/siderolabs/talos/cmd/talosctl
KUBECTL_REF=4c9411232e10168d7b050c49a1b59f6df9d7ea4b
KUBECTL_REPO=https://github.com/kubernetes/kubernetes
KUBECTL_PKG=k8s.io/kubernetes/cmd/kubectl
KSOPS_REF=b524c792a9ce0409dfec1aa9da42ea56ab85a16f
KSOPS_REPO=https://github.com/viaduct-ai/kustomize-sops
KUSTOMIZE_REF=3cac8448d3d604e1a38cd3c4bfe4585438f259ed
KUSTOMIZE_REPO=https://github.com/kubernetes-sigs/kustomize
KUSTOMIZE_PKG=./kustomize
HELM_REF=c9f554d75773799f72ceef38c51210f1842a1dea
HELM_REPO=https://github.com/helm/helm
HELM_PKG=./cmd/helm