From a51f10c5a78d67d92aa1eeab1d07e0b14da17b73 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 21 Feb 2023 21:11:44 +0000 Subject: [PATCH] using minikube test env --- .devcontainer/devcontainer.json | 14 ++------ .../local-features/tweaks/install.sh | 2 +- .vscode/tasks.json | 6 ++-- bin/start-minikube.sh | 7 ++++ k3d-default.yaml | 21 ----------- k8s/argocd/templates/ingress.yaml | 35 ------------------- k8s/argocd/values.yaml | 6 ---- 7 files changed, 14 insertions(+), 77 deletions(-) create mode 100644 bin/start-minikube.sh delete mode 100644 k3d-default.yaml delete mode 100644 k8s/argocd/templates/ingress.yaml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2e45af7..0e76d7d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,8 +1,7 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/kubernetes-helm +// README at: https://github.com/devcontainers/templates/tree/main/src/alpine { "name": "HomeLab", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "image": "mcr.microsoft.com/devcontainers/base:bullseye", "runArgs": ["--network=host"], "features": { @@ -14,7 +13,7 @@ "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { "version": "latest", "helm": "latest", - "minikube": "none" + "minikube": "latest" }, "./local-features/tweaks": {}, "ghcr.io/devcontainers/features/common-utils:2": { @@ -38,18 +37,11 @@ "gojqVersion": "latest" }, "ghcr.io/dhoeric/features/act:1": {}, - "ghcr.io/rio/features/k3d:1": {} }, - - // "remoteEnv": { - // "SYNC_LOCALHOST_KUBECONFIG": "true" - // }, - - // "initializeCommand": "cd .devcontainer && bash ensure-mount-sources", "mounts": [ { "source": "${env:HOME}${env:USERPROFILE}/.kube", - "target": "/home/vscode/kube-localhost", + "target": "/home/vscode/.kube", "type": "bind" }, { diff --git a/.devcontainer/local-features/tweaks/install.sh b/.devcontainer/local-features/tweaks/install.sh index 6f55620..4bbf545 100644 --- a/.devcontainer/local-features/tweaks/install.sh +++ b/.devcontainer/local-features/tweaks/install.sh @@ -8,7 +8,7 @@ cat >> /home/${USERNAME}/.zshrc <<- EOM source <(kubectl completion zsh) alias k=kubectl complete -o default -F __start_kubectl k -source <(k3d completion zsh) +source <(minikube completion zsh) source <(helm completion zsh) source <(argocd completion zsh) EOM diff --git a/.vscode/tasks.json b/.vscode/tasks.json index fd6b6a5..877a89b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Dev Server - Start", "type": "shell", - "command": "k3d cluster create -c k3d-default.yaml && docker logs -f k3d-k3s-default-server-0", + "command": "minikube start", "icon": { "id": "play-circle" } @@ -14,7 +14,7 @@ { "label": "Dev Server - Logs", "type": "shell", - "command": "docker logs -f k3d-k3s-default-server-0", + "command": "docker logs -f minikube", "icon": { "id": "tree-filter-on-type-off" } @@ -22,7 +22,7 @@ { "label": "Stop Dev Server", "type": "shell", - "command": "k3d cluster delete -c k3d-default.yaml", + "command": "minikube stop", "icon": { "id": "stop-circle" } diff --git a/bin/start-minikube.sh b/bin/start-minikube.sh new file mode 100644 index 0000000..c71a643 --- /dev/null +++ b/bin/start-minikube.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +minikube start +minikube addons enable ingress +minikube addons enable dashboard \ No newline at end of file diff --git a/k3d-default.yaml b/k3d-default.yaml deleted file mode 100644 index d72b41c..0000000 --- a/k3d-default.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: k3d.io/v1alpha4 -kind: Simple -metadata: - name: k3s-default -servers: 1 -agents: 0 -image: docker.io/rancher/k3s:v1.25.6-k3s1 -kubeAPI: - hostPort: "6443" -ports: - - port: 80:80 - nodeFilters: - - loadbalancer - - port: 443:443 - nodeFilters: - - loadbalancer -options: - kubeconfig: - updateDefaultKubeconfig: true - switchCurrentContext: true \ No newline at end of file diff --git a/k8s/argocd/templates/ingress.yaml b/k8s/argocd/templates/ingress.yaml deleted file mode 100644 index 370058d..0000000 --- a/k8s/argocd/templates/ingress.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# --- -# apiVersion: traefik.containo.us/v1alpha1 -# kind: IngressRoute -# metadata: -# name: argocd-server -# namespace: "{{ .Release.Namespace }}" -# spec: -# entryPoints: -# - websecure -# routes: -# - kind: Rule -# match: {{ .Values.selfapp.traefikRule }} -# priority: 10 -# services: -# - name: argocd-server -# port: 80 -# passHostHeader: true -# responseForwarding: -# flushInterval: 1ms -# scheme: https -# - name: argocd-server -# port: 443 -# passHostHeader: true -# responseForwarding: -# flushInterval: 1ms -# scheme: https -# - kind: Rule -# match: {{ .Values.selfapp.traefikRule }} && Headers(`Content-Type`, `application/grpc`) -# priority: 11 -# services: -# - name: argocd-server -# port: 80 -# scheme: h2c -# tls: -# certResolver: default \ No newline at end of file diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 89368ff..8628c0b 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -7,12 +7,6 @@ argo-cd: enabled: true hosts: - "argocd.home.sosnovsky.ca" - annotations: - cert-manager.io/cluster-issuer: letsencrypt - tls: - - hosts: - - argocd.home.sosnovsky.ca - secretName: homelab.ingress.cert.argocd selfapp: commit: "stable" repo: "asosnovsky/homelab"