diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 00f65f8..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -# Note: You can use any Debian/Ubuntu based image you want. -FROM mcr.microsoft.com/devcontainers/base:bullseye - -# [Optional] Uncomment this section to install additional OS packages. -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends \ - open-iscsi \ - nfs-common \ No newline at end of file diff --git a/.devcontainer/bash.cmd b/.devcontainer/bash.cmd deleted file mode 100644 index 652e16a..0000000 --- a/.devcontainer/bash.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -REM On Linux/macOS the passed in script will run inside of bash, but on -REM Windows, this will run a batch file with the same script name instead. - -%1.cmd \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index dabf347..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,73 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/docker-outside-of-docker-compose -{ - "name": "Docker from Docker Compose", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", - "remoteEnv": { - "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" - }, - "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "version": "latest", - "enableNonRootDocker": "true", - "moby": "true" - }, - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": true, - "configureZshAsDefaultShell": true, - "installOhMyZsh": true, - "upgradePackages": true, - "username": "vscode", - "userUid": "automatic", - "userGid": "automatic" - }, - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { - "version": "latest", - "helm": "latest", - "minikube": "none" - }, - "ghcr.io/mpriscella/features/helm-chart-testing:1": { - "version": "latest" - }, - "ghcr.io/devcontainers-contrib/features/argo-cd:1": { - "version": "latest" - }, - "ghcr.io/eitsupi/devcontainer-features/jq-likes:1": { - "jqVersion": "os-provided", - "yqVersion": "latest", - "gojqVersion": "latest" - }, - "ghcr.io/rio/features/k3d:1": {} - }, - "postCreateCommand": ".devcontainer/postCreateCommand.sh", - "mounts": [ - { - "source": "${env:HOME}${env:USERPROFILE}/.kube", - "target": "/home/vscode/.kube", - "type": "bind" - }, - { - "source": "${env:HOME}${env:USERPROFILE}/.gitconfig", - "target": "/home/vscode/.gitconfig", - "type": "bind" - }, - { - "source": "${env:HOME}${env:USERPROFILE}/.ssh", - "target": "/home/vscode/.ssh", - "type": "bind" - } - ], - "customizations": { - "vscode": { - "extensions": [ - "inercia.vscode-k3d", - "tumido.crd-snippets", - "hilleer.yaml-plus-json", - "ipedrazas.kubernetes-snippets", - "sandipchitale.vscode-kubernetes-helm-extension-pack" - ] - } - } -} \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index 2078d1e..0000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3' - -services: - app: - network_mode: host - build: - context: . - dockerfile: Dockerfile - - volumes: - - /var/run/docker.sock:/var/run/docker-host.sock - - ../..:/workspaces:cached - - "~/.ssh:/home/vscode/.ssh" - - "~/.gitconfig:/home/vscode/.gitconfig" - - entrypoint: /usr/local/share/docker-init.sh - command: sleep infinity - environment: - - KUBE_EDITOR="code -w" \ No newline at end of file diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh deleted file mode 100755 index 8a0e35b..0000000 --- a/.devcontainer/postCreateCommand.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e - -cat >> /home/vscode/.zshrc <<- EOM -source <(kubectl completion zsh) -alias k=kubectl -complete -o default -F __start_kubectl k -source <(k3d completion zsh) -source <(helm completion zsh) -source <(argocd completion zsh) -EOM - diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index 789ba1f..308ccaa 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e full_path=${1} @@ -28,7 +28,7 @@ if [ "$chart_checksum" == "$previous_checksum" ]; then echo " > skipping helm update!" else echo " > updating dependencies..." - helm dependency update + helm dependency update fi popd &> /dev/null echo $chart_checksum > $chart_checksum_path @@ -49,10 +49,10 @@ fi echo " > running..." helm template $app $full_path --namespace $app \ - --debug \ - --values $full_path/values.yaml \ - --values $full_path/values-$deployment.yaml \ - > $tmp_path +--debug \ +--values $full_path/values.yaml \ +--values $full_path/values-$deployment.yaml \ +> $tmp_path echo "Wrote Template! --> $tmp_path" echo "===============" diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh deleted file mode 100755 index cb5aa23..0000000 --- a/bin/dryrun-argo.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -mkdir -p .tmp - -deployment=${1:-dev} -keep_old=${2:-no} -keep_old=$(echo "${keep_old:0:1}" | tr '[:upper:]' '[:lower:]') -app=argocd -location=k8s/$app -full_path=$(realpath $location) -tmp_path=".tmp/$location/$deployment-$app.yaml" -mkdir -p $(dirname $tmp_path) - -pushd $full_path &> /dev/null -helm dependency update &> /dev/null -popd &> /dev/null - -if [ -f "$tmp_path" ]; then - echo "Found existing file" - if [[ -f "$tmp_path".old && "${keep_old:0:1}" == "y" ]]; then - num_files=$(ls -1q "${tmp_path}.old"* 2> /dev/null | wc -l | tr -d '[:space:]') - echo " -> Renaming old file to "$tmp_path".old.${num_files}" - mv $tmp_path $tmp_path".old.${num_files}" - else - rm $tmp_path".old"* - echo " -> Renaming old file to "$tmp_path".old" - mv $tmp_path $tmp_path".old" - fi -fi -helm template $app $full_path --namespace $app \ - --debug \ - --create-namespace \ - --values k8s/argocd/values.yaml \ - --values k8s/argocd/values-${deployment}.yaml \ - --set selfapp.deployment="${deployment}" \ - --set selfapp.enabled="true" \ - --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ - > $tmp_path - -echo "Wrote Template! --> $tmp_path" -echo "===============" - -if [ -f "$tmp_path.old" ]; then - echo " -> creating diff -- $tmp_path.diff" - diff -u $tmp_path".old" $tmp_path > "$tmp_path.diff" -fi \ No newline at end of file diff --git a/bin/install-app.sh b/bin/install-app.sh index e08f86b..866adcf 100755 --- a/bin/install-app.sh +++ b/bin/install-app.sh @@ -1,37 +1,45 @@ -#!/bin/bash -set -e +#!/usr/bin/env bash +mkdir -p .tmp -full_path=${1} -deployment=${2:-dev} -action=${3:-install} -app=$(basename $full_path) -location=$(dirname $full_path) +deployment=${1:-dev} +keep_old=${2:-no} +keep_old=$(echo "${keep_old:0:1}" | tr '[:upper:]' '[:lower:]') +app=argocd +location=k8s/$app +full_path=$(realpath $location) tmp_path=".tmp/$location/$deployment-$app.yaml" - - mkdir -p $(dirname $tmp_path) pushd $full_path &> /dev/null helm dependency update &> /dev/null popd &> /dev/null -extraArgs="" -for f in k8s/argocd/values/shared/*.yaml; do - full_file_path=$(realpath $f) - extraArgs=$extraArgs" --values ${full_file_path}" -done -for f in k8s/argocd/values/$deployment/*.yaml; do - full_file_path=$(realpath $f) - extraArgs=$extraArgs" --values ${full_file_path}" -done +if [ -f "$tmp_path" ]; then + echo "Found existing file" + if [[ -f "$tmp_path".old && "${keep_old:0:1}" == "y" ]]; then + num_files=$(ls -1q "${tmp_path}.old"* 2> /dev/null | wc -l | tr -d '[:space:]') + echo " -> Renaming old file to "$tmp_path".old.${num_files}" + mv $tmp_path $tmp_path".old.${num_files}" + else + rm $tmp_path".old"* + echo " -> Renaming old file to "$tmp_path".old" + mv $tmp_path $tmp_path".old" + fi +fi +helm template $app $full_path --namespace $app \ +--debug \ +--create-namespace \ +--values k8s/argocd/values.yaml \ +--values k8s/argocd/values-${deployment}.yaml \ +--set selfapp.deployment="${deployment}" \ +--set selfapp.enabled="true" \ +--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ +> $tmp_path -echo "Installing $app" - -helm $action $app $full_path --namespace $app \ - --debug \ - --values $full_path/values.yaml \ - --create-namespace \ - --dependency-update \ - $extraArgs \ - > $tmp_path +echo "Wrote Template! --> $tmp_path" +echo "===============" +if [ -f "$tmp_path.old" ]; then + echo " -> creating diff -- $tmp_path.diff" + diff -u $tmp_path".old" $tmp_path > "$tmp_path.diff" +fi \ No newline at end of file diff --git a/bin/install-argo.sh b/bin/install-argo.sh index f739698..1e7fbd8 100755 --- a/bin/install-argo.sh +++ b/bin/install-argo.sh @@ -1,33 +1,40 @@ -#!/bin/bash -set -e +#!/usr/bin/env bash +set -e pushd k8s/argocd +echo "Installing dependencies..." helm dependency update -DEPLOYMENT=${1:-dev} - popd -helm install argocd k8s/argocd \ - --namespace argocd \ - --create-namespace \ - --values k8s/argocd/values.yaml \ - --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ - --set selfapp.deployment=$DEPLOYMENT +DEPLOYMENT=${1:-dev} +echo "Installing initial Chart..." +helm install argocd k8s/argocd \ +--namespace argocd \ +--create-namespace \ +--values k8s/argocd/values.yaml \ +--set selfapp.deployment="${DEPLOYMENT}" \ +--set selfapp.sshkey="$(cat ~/.ssh/github_ed)" + +echo "Waiting on argo to get started" watch -n1 "kubectl -n argocd get all" +echo "Login to argo" argocd login cd.argoproj.io --core kubectl config set-context --current --namespace argocd argocd admin initial-password +echo "Enabling selfapp" helm upgrade argocd k8s/argocd \ - --namespace argocd \ - --create-namespace \ - --values k8s/argocd/values.yaml \ - --set selfapp.enabled="true" \ - --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ - --set selfapp.deployment=$DEPLOYMENT +--namespace argocd \ +--create-namespace \ +--values k8s/argocd/values.yaml \ +--set selfapp.enabled="true" \ +--set selfapp.deployment="${DEPLOYMENT}" \ +--set selfapp.sshkey="$(cat ~/.ssh/github_ed)" + +echo "Final sync" +argocd app sync argocd/ -argocd app sync argocd/argocd \ No newline at end of file diff --git a/bin/make-new-chart.sh b/bin/make-new-chart.sh index fb8ed8c..866adcf 100755 --- a/bin/make-new-chart.sh +++ b/bin/make-new-chart.sh @@ -1,19 +1,45 @@ -#!/bin/bash -set -e +#!/usr/bin/env bash +mkdir -p .tmp -full_path=${1} -app=$(basename $full_path) -location=$(dirname $full_path) -typeofapp=$(basename $location) +deployment=${1:-dev} +keep_old=${2:-no} +keep_old=$(echo "${keep_old:0:1}" | tr '[:upper:]' '[:lower:]') +app=argocd +location=k8s/$app +full_path=$(realpath $location) +tmp_path=".tmp/$location/$deployment-$app.yaml" +mkdir -p $(dirname $tmp_path) -mkdir -p $full_path/templates -touch $full_path/values.yaml -touch $full_path/values-{dev,prod}.yaml -cat <> $full_path/Chart.yaml -apiVersion: v2 -name: $app -description: An $typeofapp service for homelab -type: application -version: 0.1.0 -dependencies: [] -EOT \ No newline at end of file +pushd $full_path &> /dev/null +helm dependency update &> /dev/null +popd &> /dev/null + +if [ -f "$tmp_path" ]; then + echo "Found existing file" + if [[ -f "$tmp_path".old && "${keep_old:0:1}" == "y" ]]; then + num_files=$(ls -1q "${tmp_path}.old"* 2> /dev/null | wc -l | tr -d '[:space:]') + echo " -> Renaming old file to "$tmp_path".old.${num_files}" + mv $tmp_path $tmp_path".old.${num_files}" + else + rm $tmp_path".old"* + echo " -> Renaming old file to "$tmp_path".old" + mv $tmp_path $tmp_path".old" + fi +fi +helm template $app $full_path --namespace $app \ +--debug \ +--create-namespace \ +--values k8s/argocd/values.yaml \ +--values k8s/argocd/values-${deployment}.yaml \ +--set selfapp.deployment="${deployment}" \ +--set selfapp.enabled="true" \ +--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ +> $tmp_path + +echo "Wrote Template! --> $tmp_path" +echo "===============" + +if [ -f "$tmp_path.old" ]; then + echo " -> creating diff -- $tmp_path.diff" + diff -u $tmp_path".old" $tmp_path > "$tmp_path.diff" +fi \ No newline at end of file diff --git a/k3d-default.yaml b/k3d-default.yaml deleted file mode 100644 index 76b89da..0000000 --- a/k3d-default.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -apiVersion: k3d.io/v1alpha4 -kind: Simple -metadata: - name: k3s-default -servers: 1 -agents: 1 -image: docker.io/rancher/k3s:v1.25.6-k3s1 -# volumes: -# - volume: /tmp/longhorn:/var/lib/longhorn:shared -# nodeFilters: -# - server:* -# - agent:* -# - volume: /etc/iscsi:/etc/iscsi:shared -# nodeFilters: -# - server:* -# - agent:* -# - volume: /sbin/iscsiadm:/sbin/iscsiadm:shared -# nodeFilters: -# - server:* -# - agent:* -kubeAPI: - hostPort: "6443" -ports: - - port: 80:80 - nodeFilters: - - loadbalancer - - port: 443:443 - nodeFilters: - - loadbalancer -options: - kubeconfig: - updateDefaultKubeconfig: true - switchCurrentContext: true diff --git a/k8s/argoapps/templates/_helpers/service-monitor.yaml b/k8s/argoapps/templates/_helpers/service-monitor.yaml deleted file mode 100644 index 9161168..0000000 --- a/k8s/argoapps/templates/_helpers/service-monitor.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{ define "homelab.prom.svcm" }} ---- -apiVersion: v1 -kind: Endpoints -metadata: - name: "rp-metrics-{{.name}}" - labels: - app.kubernetes.io/name: rp-metrics - app.kubernetes.io/instance: {{ .name }} -subsets: -- addresses: - - ip: "{{ .ip }}" - ports: - - port: {{ .port | default 80 }} - protocol: TCP ---- -apiVersion: v1 -kind: Service -metadata: - name: "rp-metrics-{{.name}}" - labels: - app.kubernetes.io/name: rp-metrics - app.kubernetes.io/instance: {{ .name }} -spec: - type: ClusterIP - ports: - - port: 80 - protocol: TCP - targetPort: {{ .port | default 9100 }} -{{ end }} \ No newline at end of file diff --git a/k8s/argoapps/templates/external-monitors.yaml b/k8s/argoapps/templates/external-monitors.yaml deleted file mode 100644 index da039a0..0000000 --- a/k8s/argoapps/templates/external-monitors.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - labels: - app.kubernetes.io/managed-by: argoapps - app.kubernetes.io/name: external-svc-monitor - release: prometheus - name: external-svc-monitor - namespace: chart-prometheus -spec: - endpoints: - - honorLabels: true - path: "/metrics" - port: "80" - scheme: http - scrapeTimeout: "30s" - jobLabel: external-svc-monitor - selector: - matchLabels: - app.kubernetes.io/name: rp-metrics - -{{- range $def := .Values.externalPrometheusExporters }} - -{{ include "homelab.prom.svcm" $def }} - -{{ end -}} \ No newline at end of file diff --git a/k8s/argoapps/templates/nodeport.yaml b/k8s/argoapps/templates/nodeport.yaml deleted file mode 100644 index 23bca30..0000000 --- a/k8s/argoapps/templates/nodeport.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -kind: Service -apiVersion: v1 -metadata: - name: nodeport - namespace: chart-database -spec: - selector: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: database - app.kubernetes.io/name: postgresql - type: NodePort - ports: - - name: tcp-postgresql - port: 5432 - protocol: TCP - targetPort: tcp-postgresql - nodePort: 30543 diff --git a/k8s/argoapps/templates/ns.yaml b/k8s/argoapps/templates/ns.yaml deleted file mode 100644 index 1720a78..0000000 --- a/k8s/argoapps/templates/ns.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: email \ No newline at end of file diff --git a/k8s/argoapps/templates/secrets.yaml b/k8s/argoapps/templates/secrets.yaml deleted file mode 100644 index 5479409..0000000 --- a/k8s/argoapps/templates/secrets.yaml +++ /dev/null @@ -1,122 +0,0 @@ -{{ range $_, $secretsData := .Values.secrets }} - -{{ if $secretsData.enableClusterStore }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: secret-manager-{{ $secretsData.namespace }} - namespace: {{ $secretsData.namespace }} -rules: -- apiGroups: [""] - resources: ["secrets"] - verbs: ["list", "get"] ---- -apiVersion: v1 -automountServiceAccountToken: true -kind: ServiceAccount -metadata: - name: secret-manager-{{ $secretsData.namespace }} - namespace: {{ $secretsData.namespace }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: secret-manager-{{ $secretsData.namespace }} - namespace: {{ $secretsData.namespace }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: secret-manager-{{ $secretsData.namespace }} -subjects: -- kind: ServiceAccount - name: secret-manager-{{ $secretsData.namespace }} - namespace: {{ $secretsData.namespace }} - ---- -apiVersion: external-secrets.io/v1beta1 -kind: ClusterSecretStore -metadata: - name: {{ $secretsData.namespace }} -spec: - provider: - kubernetes: - remoteNamespace: {{ $secretsData.namespace }} - server: - caProvider: - type: ConfigMap - name: kube-root-ca.crt - key: ca.crt - namespace: {{ $secretsData.namespace }} - auth: - serviceAccount: - name: secret-manager-{{ $secretsData.namespace }} - namespace: {{ $secretsData.namespace }} -{{ end }} - - -{{ range $key, $value := $secretsData.secrets }} ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: {{ $value.name }} - namespace: {{ $secretsData.namespace }} - annotations: - homelab-secret/type: "externally-filled" - {{- if $value.autogenerated }} - secret-generator.v1.mittwald.de/autogenerate: {{ join "," $value.autogenerated | quote }} - {{- end }} -data: -{{- if $value.data }} - {{- tpl $value.data $ | nindent 4}} -{{ else }} - _placeholder: "" -{{ end }} - -{{ range $ekey, $evalue := ($value.external | default (dict)) }} ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: {{ printf "%s-%s" $value.name $ekey | lower | replace "_" "-" }} - namespace: {{ $secretsData.namespace }} -spec: - refreshInterval: 1h - secretStoreRef: - kind: ClusterSecretStore - name: {{ $evalue.store }} - target: - name: {{ $value.name }} - creationPolicy: Merge - data: - - secretKey: {{ $ekey }} - remoteRef: - key: {{ $evalue.secretName }} - property: {{ $evalue.secretKey }} -{{ end }} - -{{ end }} - - -{{ range $key, $value := $secretsData.configmaps }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $value.name }} - namespace: {{ $secretsData.namespace }} - annotations: - homelab-secret/type: "externally-filled" -data: -{{- if $value.data }} - {{- tpl $value.data $ | nindent 4}} -{{ else }} - _placeholder: "" -{{ end }} - -{{ end }} - - -{{ end }} diff --git a/k8s/argoapps/templates/storage.yaml b/k8s/argoapps/templates/storage.yaml deleted file mode 100644 index 0d9c5d7..0000000 --- a/k8s/argoapps/templates/storage.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{ range $key, $value := .Values.storage }} ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ $value.name }} - namespace: {{ $value.namespace }} -spec: - storageClassName: {{ $.Values.global.nfs.storageClass }} - accessModes: - {{- $value.accessModes | toYaml | nindent 4 }} - resources: - {{- $value.resources | toYaml | nindent 4 }} -{{ end }} \ No newline at end of file diff --git a/k8s/argoapps/values-dev.yaml b/k8s/argoapps/values-dev.yaml index 57b3765..40c50e8 100644 --- a/k8s/argoapps/values-dev.yaml +++ b/k8s/argoapps/values-dev.yaml @@ -1,3 +1,2 @@ global: deployment: dev - domain: "me.local" diff --git a/k8s/argoapps/values-prod.yaml b/k8s/argoapps/values-prod.yaml index 3391e10..2df1d21 100644 --- a/k8s/argoapps/values-prod.yaml +++ b/k8s/argoapps/values-prod.yaml @@ -1,41 +1,2 @@ global: - deployment: prod - domain: "sosnovsky.ca" - secondaryDomain: "skyg.ca" - tls: - useWildCard: true - enabled: true - issuer: "letsencrypt" - acmeServer: "https://acme-v02.api.letsencrypt.org/directory" - skipTLSVerify: true - nfs: - server: "tnas1.lab.local" - share: "/mnt/EightTerra/k3s-cluster" - additionalShares: - torrents: "/mnt/EightTerra/DownloadedTorrents" - familyvideos: "/mnt/EightTerra/FamilyStorage/Video" - familyphotos: "/mnt/EightTerra/FamilyStorage" - familyphotosSubPath: "Pictures" - mqtt: - username: k3s - password: fZ!HauNB9% - -secrets: - ingresses: - secrets: - cloudflare: - name: "cloudflare-apitoken" - -# infrastructureCharts: -# amd-gpu: -# repoURL: "https://radeonopencompute.github.io/k8s-device-plugin/" -# targetRevision: "0.10.0" -# values: |- -# namespace: chart-amd-gpu -# labeller: -# enabled: true -# node-feature-discovery: -# repoURL: "https://kubernetes-sigs.github.io/node-feature-discovery/charts" -# targetRevision: "0.10.0" -# values: |- -# namespace: chart-node-feature-discovery \ No newline at end of file + deployment: prod \ No newline at end of file diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 5acc1cd..07f2efa 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -5,226 +5,7 @@ gitops: global: email: "ariel@sosnovsky.ca" timezone: America/Toronto - domain: "changeme" - rootSubDomain: "home" - secondaryDomain: "changeme" - tls: - enabled: false - issuer: "" - acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" - skipTLSVerify: "false" - nfs: - storageClass: "nfs-generic" - server: "changme" - share: "changeme" - additionalShares: - torrents: "changeme" - familyvideos: "changeme" - familyphotos: "changeme" - smtp: - email: "ariel.sosnovsky@gmail.com" - mqtt: - port: 1883 - host: castle.hub.internal -apps: - webapps: - valuesFile: webapps.yaml - syncPolicy: - automated: - selfHeal: true - syncOptions: - - ServerSideApply=true - photos: - disabled: true - values: |- - immich: - shared: - libraryPVC: - nfs: - path: {{ .Values.global.nfs.additionalShares.familyphotos }} - server: {{ .Values.global.nfs.server }} - importPVC: - nfs: - path: {{ .Values.global.nfs.additionalShares.familyphotos }} - server: {{ .Values.global.nfs.server }} - - videohosting: - values: "" - - nextcloud: - valuesFile: nextcloud.yaml - - ingresses: - valuesFile: ingresses.yaml - - db-users: - namespace: chart-database - values: |- - postgresSecret: "{{ .Values.secrets.database.secrets.dbmain.name }}" - - postfix: - namespace: email - values: |- - smtp_configs: - SMTP_SERVER: "smtp.gmail.com" - SMTP_PORT: "587" - SMTP_USERNAME: "{{.Values.global.smtp.email}}" - smtp_password_secret: {{ .Values.secrets.smtp.secrets.smtp.name }} - smtp_password_secret_key: password - -infrastructureCharts: - cert-manager: - repoURL: "https://charts.jetstack.io" - targetRevision: "1.10.2" - values: |- - installCRDs: true - external-secrets: - repoURL: "https://charts.external-secrets.io" - targetRevision: "0.9.9" - values: |- - installCRDs: true - nfs-generic-storageclass: - chart: nfs-subdir-external-provisioner - repoURL: "https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/" - targetRevision: "v4.0.2" - values: |- - storageClass: - name: "{{ .Values.global.nfs.storageClass }}" - nfs: - server: "{{ .Values.global.nfs.server }}" - path: "{{ .Values.global.nfs.share }}" - kubernetes-secret-generator: - repoURL: "https://helm.mittwald.de" - targetRevision: "v3.4.0" - database: - chart: postgresql - repoURL: "https://charts.bitnami.com/bitnami" - targetRevision: "12.1.8" - valuesFile: database.yaml - prometheus: - chart: kube-prometheus-stack - repoURL: "https://prometheus-community.github.io/helm-charts" - targetRevision: "56.21.2" - valuesFile: prometheus.yaml - enableServerSideApply: true - authentik: - repoURL: https://charts.goauthentik.io - targetRevision: "2024.6.1" - valuesFile: authentik.yaml - authelia: - repoURL: https://charts.authelia.com - targetRevision: "0.8.58" - valuesFile: authelia.yaml - homepage: - repoURL: https://jameswynn.github.io/helm-charts - chart: homepage - targetRevision: "1.2.3" - valuesFile: homepage.yaml - tailscale: - repoURL: https://pkgs.tailscale.com/helmcharts - chart: tailscale-operator - targetRevision: "1.70.0" -secrets: - tailscale: - namespace: chart-tailscale - secrets: - oauth: - name: operator-oauth - ingresses: - enableClusterStore: true - namespace: apps-ingresses - secrets: {} - database: - enableClusterStore: true - namespace: chart-database - secrets: - dbmain: - name: "pg.password" - smtp: - enableClusterStore: true - namespace: email - secrets: - smtp: - name: "smtp.creds" - data: |- - username: "{{.Values.global.smtp.email | b64enc }}" - prometheus: - namespace: chart-prometheus - configmaps: - auth: - name: authentick-config-envs - authentik: - namespace: chart-authentik - secrets: - env: - name: "authentik-env" - autogenerated: - - AUTHENTIK_SECRET_KEY - data: |- - AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME: {{ "False" | b64enc }} - external: - AUTHENTIK_POSTGRESQL__PASSWORD: - store: chart-database - secretName: "password.pg.authentik" - secretKey: "password" -storage: - database: - name: primary-database - namespace: chart-database - accessModes: - - ReadWriteMany - resources: - requests: - storage: 8Gi - ollama: - name: ollama - namespace: apps-webapps - accessModes: - - ReadWriteMany - resources: - requests: - storage: 8Gi - ollamaWebGui: - name: ollama-web-gui - namespace: apps-webapps - accessModes: - - ReadWriteMany - resources: - requests: - storage: 8Gi - nextcloudData: - name: nextcloud-data - namespace: apps-nextcloud - accessModes: - - ReadWriteMany - resources: - limits: - storage: 100Gi - requests: - storage: 10Gi - nextcloudConfig: - name: nextcloud-config - namespace: apps-nextcloud - accessModes: - - ReadWriteMany - resources: - limits: - storage: 100Gi - requests: - storage: 10Gi - nextcloudRedisMaster: - name: redis-master - namespace: apps-nextcloud - accessModes: - - ReadWriteMany - resources: - limits: - storage: 20Gi - requests: - storage: 1Gi - -externalPrometheusExporters: - - name: fwbook - ip: 10.0.0.119 \ No newline at end of file +infrastructureCharts: {} +apps: {} \ No newline at end of file diff --git a/k8s/argocd/Chart.yaml b/k8s/argocd/Chart.yaml index 79733dc..f27116f 100644 --- a/k8s/argocd/Chart.yaml +++ b/k8s/argocd/Chart.yaml @@ -5,5 +5,5 @@ type: application version: 0.1.0 dependencies: - name: argo-cd - version: 6.6.0 + version: 7.6.12 repository: https://argoproj.github.io/argo-helm diff --git a/os/routers/openwrt-mesh/remote-scripts/common.sh b/os/routers/openwrt-mesh/remote-scripts/common.sh index 1660c98..0a80adf 100644 --- a/os/routers/openwrt-mesh/remote-scripts/common.sh +++ b/os/routers/openwrt-mesh/remote-scripts/common.sh @@ -1,9 +1,9 @@ -#!/bin/bash +#!/usr/bin/env bash opkg update --no-check-certificate opkg remove wpad-basic-* opkg install --force-overwrite \ - --no-check-certificate \ - wpad-openssl +--no-check-certificate \ +wpad-openssl uci set system.@system[0].hostname="${HOSTNAME}" uci commit diff --git a/os/routers/openwrt-mesh/remote-scripts/create-ap.sh b/os/routers/openwrt-mesh/remote-scripts/create-ap.sh index 66ef626..9d99e73 100755 --- a/os/routers/openwrt-mesh/remote-scripts/create-ap.sh +++ b/os/routers/openwrt-mesh/remote-scripts/create-ap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash HOSTNAME=${1:-$HOSTNAME} @@ -12,10 +12,10 @@ while [ "$n" -gt 0 ]; do done for i in firewall dnsmasq odhcpd; do - if /etc/init.d/"$i" enabled; then - /etc/init.d/"$i" disable - /etc/init.d/"$i" stop - fi + if /etc/init.d/"$i" enabled; then + /etc/init.d/"$i" disable + /etc/init.d/"$i" stop + fi done uci set network.lan.proto='dhcp' diff --git a/os/routers/openwrt-mesh/remote-scripts/create-main.sh b/os/routers/openwrt-mesh/remote-scripts/create-main.sh index 427017d..dff0b9c 100755 --- a/os/routers/openwrt-mesh/remote-scripts/create-main.sh +++ b/os/routers/openwrt-mesh/remote-scripts/create-main.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Turn an OpenWrt dumb access point into a Wi-fi mesh point # ###################### @@ -56,7 +56,7 @@ uci set wireless.wifinet0.mesh_rssi_threshold='0' uci set wireless.wifinet0.key="$MESH_PWD" uci set wireless.wifinet0.network='lan' uci set "wireless.$MESH_RADIO.channel=$MESH_CHANNEL" -uci delete "wireless.$MESH_RADIO.disabled" +uci delete "wireless.$MESH_RADIO.disabled" # create the AP Wifi uci set wireless.wifinet1=wifi-iface @@ -71,7 +71,7 @@ uci set wireless.wifinet1.ft_over_ds='0' uci set wireless.wifinet1.ft_psk_generate_local='1' uci set wireless.wifinet1.network='lan' uci set "wireless.$WIFI_RADIO.channel"=$WIFI_CHANNEL -uci delete "wireless.$WIFI_RADIO.disabled" +uci delete "wireless.$WIFI_RADIO.disabled" uci commit diff --git a/shell.nix b/shell.nix index 69fc693..f4c159d 100644 --- a/shell.nix +++ b/shell.nix @@ -12,7 +12,9 @@ pkgs.mkShell { python312Packages.pyyaml ]; shellHook = '' - export PROMPT="🏠> $PROMPT" - echo "Welcome to HomeLab!" + echo "$(pwd)" + export PATH="$(pwd)/bin:$PATH" + export PROMPT="🏠> $PROMPT" + echo "Welcome to HomeLab!" ''; }