Update README

.github/workflows/setup-cluster.yml

@@ -28,9 +28,9 @@ jobs:
       run: kubectl get pods -A -o wide
     - shell: bash
       env:
-        TOKEN: ${{ secrets.GITEA_TOKEN }}
+        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
       run: |
-        GITEA_TOKEN="$TOKEN" ./run.sh
+        ./run.sh
     - name: kubectl
       run: |
         kubectl get pods -A -o wide && \

.gitignore

@@ -1,6 +1,6 @@
 bin/*
-flux_*.tar.gz
+flux_2.2.1_linux_amd64.tar.gz
 flux
 helm
-terraform_*.zip
+terraform_1.6.6_linux_amd64.zip
 terraform

clusters/dev/minio.yaml

@@ -1,16 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-  name: minio
-  namespace: minio
-spec:
-  chart:
-    spec:
-      chart: minio-operator
-      reconcileStrategy: ChartVersion
-      sourceRef:
-        kind: HelmRepository
-        name: minio
-      version: 4.3.7
-  interval: 1m0s

clusters/dev/source_minio.yaml

@@ -1,9 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: minio
-  namespace: minio
-spec:
-  interval: 1m0s
-  url: minio-operator

clusters/dev/source_spinnaker.yaml

@@ -1,9 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: armory
-  namespace: cicd
-spec:
-  interval: 1m0s
-  url: https://armory.jfrog.io/artifactory/charts/

clusters/dev/spinnaker.yaml

@@ -1,16 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-  name: spinnaker
-  namespace: cicd
-spec:
-  chart:
-    spec:
-      chart: armory-spinnaker-operator
-      reconcileStrategy: ChartVersion
-      sourceRef:
-        kind: HelmRepository
-        name: armory
-      version: 1.8.11
-  interval: 1m0s

deploy

@@ -5,8 +5,7 @@
 
 set -o pipefail
 
-# Namespaces
+FLUX_MANIFEST_PATH="clusters/minikube"
-FLUX_MANIFEST_PATH="clusters/dev"
 readonly FLUX_MANIFEST_PATH
 APP_NAMESPACE="app"
 readonly APP_NAMESPACE
@@ -14,12 +13,6 @@ SECSCAN_NAMESPACE="security-scan"
 readonly SECSCAN_NAMESPACE
 MONITORING_NAMESPACE="monitoring"
 readonly MONITORING_NAMESPACE
-SPINNAKER_NAMESPACE="cicd"
-readonly SPINNAKER_NAMESPACE
-MINIO_NAMESPACE="minio"
-readonly MINIO_NAMESPACE
-
-# Helm Chart versions
 PGSQLHA_CHART_VERSION="12.3.7"
 readonly PGSQLHA_CHART_VERSION
 PGSQLHA_OCI_URL="oci://registry-1.docker.io/bitnamicharts/postgresql-ha"
@@ -30,12 +23,8 @@ GTFSO_VBB_CHART_VERSION="0.1.0"
 readonly GTFSO_VBB_CHART_VERSION
 PROM_STACK_CHART_VERSION="55.7.0"
 readonly PROM_STACK_CHART_VERSION
-SPINNAKER_OPERATOR_CHART_VERSION="1.8.11"
-readonly SPINNAKER_OPERATOR_CHART_VERSION
 TRIVY_CHART_VERSION="0.18.4"
 readonly TRIVY_CHART_VERSION
-MINIO_CHART_VERSION="4.3.7"
-readonly MINIO_CHART_VERSION
 
 mkdir -p "${FLUX_MANIFEST_PATH}"
 
@@ -43,8 +32,6 @@ mkdir -p "${FLUX_MANIFEST_PATH}"
 kubectl create namespace "${APP_NAMESPACE}"
 kubectl create namespace "${MONITORING_NAMESPACE}"
 kubectl create namespace "${SECSCAN_NAMESPACE}"
-kubectl create namespace "${SPINNAKER_NAMESPACE}"
-kubectl create namespace "${MINIO_NAMESPACE}"
 
 # Add Deployments / Helm Charts via fluxcd
 # Add Helm Charts via Flux HelmRelease CRD
@@ -68,7 +55,6 @@ printf "Using flux to create Sources and HelmReleases\n"
     --source HelmRepository/bitnami \
     --namespace "${APP_NAMESPACE}" \
     --export > "${FLUX_MANIFEST_PATH}/pgsql-ha.yaml"
-
 ./flux create helmrelease gtfso-import \
     --chart charts/gtfso-import \
     --namespace ${APP_NAMESPACE} \
@@ -92,18 +78,6 @@ printf "Using flux to create Sources and HelmReleases\n"
     --source=HelmRepository/prometheus-community \
     --export > "${FLUX_MANIFEST_PATH}/prometheus-stack.yaml"
 
-# Spinnaker
-./flux create source helm armory \
-    --url https://armory.jfrog.io/artifactory/charts/ \
-    --namespace "${SPINNAKER_NAMESPACE}" \
-    --export > "${FLUX_MANIFEST_PATH}/source_spinnaker.yaml"
-./flux create helmrelease spinnaker \
-    --chart armory-spinnaker-operator \
-    --chart-version "${SPINNAKER_OPERATOR_CHART_VERSION}" \
-    --namespace "${SPINNAKER_NAMESPACE}" \
-    --source=HelmRepository/armory \
-    --export > "${FLUX_MANIFEST_PATH}/spinnaker.yaml"
-
 # Vulnerability Scan
 ./flux create source helm aqua \
     --url https://aquasecurity.github.io/helm-charts/ \
@@ -115,15 +89,3 @@ printf "Using flux to create Sources and HelmReleases\n"
     --namespace "${SECSCAN_NAMESPACE}" \
     --source=HelmRepository/aqua \
     --export > "${FLUX_MANIFEST_PATH}/trivy.yaml"
-
-# MinIO Object Storage
-./flux create source helm minio \
-    --url minio-operator https://operator.min.io \
-    --namespace "${MINIO_NAMESPACE}" \
-    --export > "${FLUX_MANIFEST_PATH}/source_minio.yaml"
-./flux create helmrelease minio \
-    --chart minio-operator \
-    --chart-version "${MINIO_CHART_VERSION}" \
-    --namespace "${MINIO_NAMESPACE}" \
-    --source=HelmRepository/minio \
-    --export > "${FLUX_MANIFEST_PATH}/minio.yaml"

setup-cluster

@@ -6,76 +6,47 @@
 
 set -o pipefail
 
-PRJ="flux"
+PRJ="obch"
 readonly PRJ
 USE_TF=0
 readonly USE_TF
 GITEA_HOSTNAME="git.e2m.io"
 readonly GITEA_HOSTNAME
-GITEA_USER="flux-user"
+GITEA_USER="obch-flux"
 readonly GITEA_USER
 FLUX_VERSION="2.2.1"
 readonly FLUX_VERSION
 FLUX_CHECKSUM="466756ca6b3437d30a6a5fb58e60f3e5a82d8291f3869cfc55b6f041962601b5"
 readonly FLUX_CHECKSUM
-FLUX_ARCHIVE_LINUX="flux_${FLUX_VERSION}_linux_amd64.tar.gz"
+FLUX_ARCHIVE="flux_${FLUX_VERSION}_linux_amd64.tar.gz"
-readonly FLUX_ARCHIVE_LINUX
+readonly FLUX_ARCHIVE
-FLUX_ARCHIVE_MACOS="flux_${FLUX_VERSION}_darwin_arm64.tar.gz"
+FLUX_URL="https://github.com/fluxcd/flux2/releases/download/v${FLUX_VERSION}/${FLUX_ARCHIVE}"
-readonly FLUX_ARCHIVE_MACOS
+readonly FLUX_URL
-FLUX_URL_LINUX="https://github.com/fluxcd/flux2/releases/download/v${FLUX_VERSION}/${FLUX_ARCHIVE_LINUX}"
-readonly FLUX_URL_LINUX
-FLUX_URL_MACOS="https://github.com/fluxcd/flux2/releases/download/v${FLUX_VERSION}/${FLUX_ARCHIVE_MACOS}"
-readonly FLUX_URL_MACOS
 FLUX_FORCE_LOCAL=1
 readonly FLUX_FORCE_LOCAL
 TF_VERSION="1.6.6"
 readonly TF_VERSION
-TF_ARCHIVE_LINUX="terraform_${TF_VERSION}_linux_amd64.zip"
+TF_ARCHIVE="terraform_${TF_VERSION}_linux_amd64.zip"
-readonly TF_ARCHIVE_LINUX
+readonly TF_ARCHIVE
-TF_ARCHIVE_MACOS="terraform_${TF_VERSION}_darwin_arm64.zip"
-readonly TF_ARCHIVE_MACOS
 TF_CHECKSUM=""
 readonly TF_CHECKSUM
+TF_URL="https://releases.hashicorp.com/terraform/${TF_VERSION}/${TF_ARCHIVE}"
+readonly TF_URL
 TF_FORCE_LOCAL=1
 readonly TF_FORCE_LOCAL
-OS="Linux"
 VERBOSE=0
 readonly VERBOSE
 
 minikube_driver="podman"
 
-if [[ $(uname) == "Darwin" ]]; then
-    OS="macos"
-elif [[ $(grep '^ID=' /etc/os-release | awk -F'=' '{print $2}') == "ubuntu" ]]; then
-    OS="ubuntu"
-fi
-
-printf "Running on ${OS}\n"
-
-if [[ "$OS" = "macos" ]]; then
-    FLUX_URL="${FLUX_URL_MACOS}"
-    FLUX_ARCHIVE="${FLUX_ARCHIVE_MACOS}"
-    TF_ARCHIVE="${TF_ARCHIVE_MACOS}"
-    TF_URL="https://releases.hashicorp.com/terraform/${TF_VERSION}/${TF_ARCHIVE}"
-else
-    FLUX_URL="${FLUX_URL_LINUX}"
-    FLUX_ARCHIVE="${FLUX_ARCHIVE_LINUX}"
-    TF_ARCHIVE="${TF_ARCHIVE_LINUX}"
-    TF_URL="https://releases.hashicorp.com/terraform/${TF_VERSION}/${TF_ARCHIVE}"
-fi
-
 # We prefer podman but Ubuntu's podman is too old
-if [[ ${OS} = "ubuntu" ]]; then
+if [[ $(grep '^ID=' /etc/os-release | awk -F'=' '{print $2}') == "ubuntu" ]]; then
     minikube_driver="docker"
 fi
 
 # Start minikube
 if ! $(minikube status | grep Nonexistent\|Stopped); then
-    printf 'minikube is not running\nStarting minikube..\n'
+    printf 'minikube is not running\nStarting minikube..'
-    # Increase memory from default 2G
-    podman machine set --memory=4096
-    podman machine start
-    minikube config set memory 3800
     if [[ 0 == "${VERBOSE}" ]]; then
         minikube start --driver="${minikube_driver}"
     else
@@ -99,15 +70,11 @@ else
     printf 'k8s dashboard is already running\n'
 fi
 
-# Install terraform if local version enforced
+# Install flux if local version enforced
 if [[ "$TF_FORCE_LOCAL" = 1 ]]; then
-    if [[ -e "$TF_ARCHIVE}" ]]; then
-        printf "terraform binary exists\n"
-    else
     printf "Fetching terraform archive..\n"
     curl -LO "${TF_URL}"
-        unzip -n "${TF_ARCHIVE}"
+    unzip "${TF_ARCHIVE}"
-    fi
     TF_CMD="./terraform"
 else
     TF_CMD="terraform"
@@ -140,7 +107,7 @@ ${FLUX_CMD} bootstrap gitea \
   --owner="$GITEA_USER" \
   --repository="$PRJ"-deploy \
   --branch=main \
-  --path=clusters/dev \
+  --path=clusters/minikube \
   --personal \
   --read-write-key=true \
   --private=false