From 9ab2f615f71ed09288439005ab637f694ce56083 Mon Sep 17 00:00:00 2001 From: Ben Coleman Date: Wed, 20 Dec 2023 23:27:21 +0000 Subject: [PATCH] ver bumps --- .github/workflows/ci-build.yml | 2 +- build/frontend.Dockerfile | 4 ++-- deploy/live/app-values.yaml | 25 ------------------------- deploy/live/cert.yaml | 16 ---------------- deploy/live/ingress-values.yaml | 25 ------------------------- deploy/live/readme.md | 7 ------- 6 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 deploy/live/app-values.yaml delete mode 100644 deploy/live/cert.yaml delete mode 100644 deploy/live/ingress-values.yaml delete mode 100644 deploy/live/readme.md diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b722689..37f4a32 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -32,7 +32,7 @@ jobs: - name: "Set Go version and paths" uses: actions/setup-go@v3 with: - go-version: "^1.19.0" + go-version: "^1.21.0" - name: "Install extra tools" run: | diff --git a/build/frontend.Dockerfile b/build/frontend.Dockerfile index 371544c..31b2156 100644 --- a/build/frontend.Dockerfile +++ b/build/frontend.Dockerfile @@ -1,7 +1,7 @@ # =================================================================================== # === Stage 1: Build static serving host ============================================ # =================================================================================== -FROM golang:1.19-alpine as server-build +FROM golang:1.21-alpine as server-build WORKDIR /build @@ -23,7 +23,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build \ # ================================================================================================ # === Stage 2: Build and bundle the Vue.js app with Vue CLI 3 ==================================== # ================================================================================================ -FROM node:18-alpine as frontend-build +FROM node:20-alpine as frontend-build ARG VERSION="0.0.1" ARG BUILD_INFO="Not provided" diff --git a/deploy/live/app-values.yaml b/deploy/live/app-values.yaml deleted file mode 100644 index a5fe932..0000000 --- a/deploy/live/app-values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# -# ********* LIVE VALUES FOR DEPLOYING DAPR-STORE APP ******* -# install with -# helm install store ~/dev/dapr-store/deploy/helm/daprstore --values ~/dev/dapr-store/deploy/live/app-values.yaml --namespace dapr-store -# -# OPTIONAL: Deploy custom components -# kubectl apply -f ~/dev/dapr-store/components/orders-report.yaml -# kubectl apply -f ~/dev/dapr-store/components/orders-email.yaml -# - -image: - tag: "0.8.4" - -# Manually configured in DNS -ingress: - host: "daprstore.kube.benco.io" - certName: "kube-benco-io-cert" - -# Enable auth -auth: - clientId: "69972365-c1b6-494d-9579-5b9de2790fc3" -# cart: -# annotations: -# dapr.io/config: "custom-config" -# dapr.io/log-level: "debug" diff --git a/deploy/live/cert.yaml b/deploy/live/cert.yaml deleted file mode 100644 index 6fc2632..0000000 --- a/deploy/live/cert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# -# ********* LIVE VALUES FOR DEPLOYING CERT ******* -# -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: kube-benco-io-cert - namespace: dapr-store -spec: - secretName: kube-benco-io-cert - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - commonName: "*.kube.benco.io" - dnsNames: - - "*.kube.benco.io" diff --git a/deploy/live/ingress-values.yaml b/deploy/live/ingress-values.yaml deleted file mode 100644 index 1256485..0000000 --- a/deploy/live/ingress-values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# -# ********* LIVE VALUES FOR DEPLOYING INGRESS API GATEWAY ******* -# install with -# helm install api-gateway ingress-nginx/ingress-nginx --values ~/dev/dapr-store/deploy/live/ingress-values.yaml --namespace dapr-store -# - -controller: - service: - labels: - purpose: "daprstore-api-gateway" - - # Static IP so DNS can remain static too - # This is manually pre-created, you'll need to edit this! - loadBalancerIP: "20.254.189.197" - ingressClass: "dapr" - ingressClassResource: - name: "dapr" - podAnnotations: - dapr.io/enabled: "true" - dapr.io/app-id: "api-gateway" - dapr.io/app-port: "80" - # Really important! Without this the trick of sending traffic to the daprized service won't work - dapr.io/sidecar-listen-addresses: "0.0.0.0" - scope: - enabled: true diff --git a/deploy/live/readme.md b/deploy/live/readme.md deleted file mode 100644 index 2694a7f..0000000 --- a/deploy/live/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# Live Values - -These are Helm chart values and Kubernetes manifests for my live deployment into my own Kubernetes cluster - -They are just copies of the sample files found in /deploy/config - -These are of no interest to the project as a whole, but required for my own use