From c2480ab30aabb281130b6c91c95ab35a8fc29f92 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Thu, 13 Aug 2020 14:32:48 +0100 Subject: [PATCH] Upgrade versions for terraform scripts Update containerd, faasd and caddy 2 versions. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- docs/bootstrap/cloud-config.tpl | 11 ++++++----- .../bootstrap/digitalocean-terraform/cloud-config.tpl | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/bootstrap/cloud-config.tpl b/docs/bootstrap/cloud-config.tpl index 87a177f..365f6de 100644 --- a/docs/bootstrap/cloud-config.tpl +++ b/docs/bootstrap/cloud-config.tpl @@ -1,5 +1,6 @@ #cloud-config ssh_authorized_keys: +## Note: Replace with your own public key - ${ssh_key} package_update: true @@ -8,8 +9,8 @@ packages: - runc runcmd: -- curl -sLSf https://github.com/containerd/containerd/releases/download/v1.3.2/containerd-1.3.2.linux-amd64.tar.gz > /tmp/containerd.tar.gz && tar -xvf /tmp/containerd.tar.gz -C /usr/local/bin/ --strip-components=1 -- curl -SLfs https://raw.githubusercontent.com/containerd/containerd/v1.3.2/containerd.service | tee /etc/systemd/system/containerd.service +- curl -sLSf https://github.com/containerd/containerd/releases/download/v1.3.5/containerd-1.3.5-linux-amd64.tar.gz > /tmp/containerd.tar.gz && tar -xvf /tmp/containerd.tar.gz -C /usr/local/bin/ --strip-components=1 +- curl -SLfs https://raw.githubusercontent.com/containerd/containerd/v1.3.5/containerd.service | tee /etc/systemd/system/containerd.service - systemctl daemon-reload && systemctl start containerd - /sbin/sysctl -w net.ipv4.conf.all.forwarding=1 - mkdir -p /opt/cni/bin @@ -18,12 +19,12 @@ runcmd: - mkdir -p /var/lib/faasd/secrets/ - echo ${gw_password} > /var/lib/faasd/secrets/basic-auth-password - echo admin > /var/lib/faasd/secrets/basic-auth-user -- cd /go/src/github.com/openfaas/ && git clone https://github.com/openfaas/faasd -- curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.8.1/faasd" --output "/usr/local/bin/faasd" && chmod a+x "/usr/local/bin/faasd" +- cd /go/src/github.com/openfaas/ && git clone https://github.com/openfaas/faasd && cd faasd && git checkout 0.9.2 +- curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.9.2/faasd" --output "/usr/local/bin/faasd" && chmod a+x "/usr/local/bin/faasd" - cd /go/src/github.com/openfaas/faasd/ && /usr/local/bin/faasd install - systemctl status -l containerd --no-pager - journalctl -u faasd-provider --no-pager - systemctl status -l faasd-provider --no-pager - systemctl status -l faasd --no-pager - curl -sSLf https://cli.openfaas.com | sh -- sleep 5 && journalctl -u faasd --no-pager +- sleep 5 && journalctl -u faasd --no-pager \ No newline at end of file diff --git a/docs/bootstrap/digitalocean-terraform/cloud-config.tpl b/docs/bootstrap/digitalocean-terraform/cloud-config.tpl index 5bcdc2e..1642ec0 100644 --- a/docs/bootstrap/digitalocean-terraform/cloud-config.tpl +++ b/docs/bootstrap/digitalocean-terraform/cloud-config.tpl @@ -31,8 +31,8 @@ packages: - runc runcmd: -- curl -sLSf https://github.com/containerd/containerd/releases/download/v1.3.2/containerd-1.3.2.linux-amd64.tar.gz > /tmp/containerd.tar.gz && tar -xvf /tmp/containerd.tar.gz -C /usr/local/bin/ --strip-components=1 -- curl -SLfs https://raw.githubusercontent.com/containerd/containerd/v1.3.2/containerd.service | tee /etc/systemd/system/containerd.service +- curl -sLSf https://github.com/containerd/containerd/releases/download/v1.3.5/containerd-1.3.5-linux-amd64.tar.gz > /tmp/containerd.tar.gz && tar -xvf /tmp/containerd.tar.gz -C /usr/local/bin/ --strip-components=1 +- curl -SLfs https://raw.githubusercontent.com/containerd/containerd/v1.3.5/containerd.service | tee /etc/systemd/system/containerd.service - systemctl daemon-reload && systemctl start containerd - /sbin/sysctl -w net.ipv4.conf.all.forwarding=1 - mkdir -p /opt/cni/bin @@ -41,8 +41,8 @@ runcmd: - mkdir -p /var/lib/faasd/secrets/ - echo ${gw_password} > /var/lib/faasd/secrets/basic-auth-password - echo admin > /var/lib/faasd/secrets/basic-auth-user -- cd /go/src/github.com/openfaas/ && git clone https://github.com/openfaas/faasd -- curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.8.1/faasd" --output "/usr/local/bin/faasd" && chmod a+x "/usr/local/bin/faasd" +- cd /go/src/github.com/openfaas/ && git clone https://github.com/openfaas/faasd && cd faasd && git checkout 0.9.2 +- curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.9.2/faasd" --output "/usr/local/bin/faasd" && chmod a+x "/usr/local/bin/faasd" - cd /go/src/github.com/openfaas/faasd/ && /usr/local/bin/faasd install - systemctl status -l containerd --no-pager - journalctl -u faasd-provider --no-pager @@ -50,7 +50,7 @@ runcmd: - systemctl status -l faasd --no-pager - curl -sSLf https://cli.openfaas.com | sh - sleep 5 && journalctl -u faasd --no-pager -- wget https://github.com/caddyserver/caddy/releases/download/v2.0.0-rc.2/caddy_2.0.0-rc.2_linux_amd64.tar.gz -O /tmp/caddy.tar.gz && tar -zxvf /tmp/caddy.tar.gz -C /usr/bin/ caddy +- wget https://github.com/caddyserver/caddy/releases/download/v2.1.1/caddy_2.1.1_linux_amd64.tar.gz -O /tmp/caddy.tar.gz && tar -zxvf /tmp/caddy.tar.gz -C /usr/bin/ caddy - wget https://raw.githubusercontent.com/caddyserver/dist/master/init/caddy.service -O /etc/systemd/system/caddy.service - systemctl daemon-reload - systemctl enable caddy