diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1b25c9a..00f65f8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,5 +2,7 @@ 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 \ No newline at end of file +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/docker-compose.yml b/.devcontainer/docker-compose.yml index 72905cc..9c689c9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -26,3 +26,6 @@ services: # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. # (Adding the "ports" property to this file will not forward from a Codespace.) + + # serverlb: + # image: docker.io/rancher/k3s:v1.25.6-k3s1 diff --git a/bin/install-argo.sh b/bin/install-argo.sh index c31248b..5dd2d45 100755 --- a/bin/install-argo.sh +++ b/bin/install-argo.sh @@ -29,3 +29,5 @@ helm upgrade argocd k8s/argocd \ --values k8s/argocd/values-$DEPLOYMENT.yaml \ --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" + +argocd app sync argocd/argocd \ No newline at end of file diff --git a/k3d-default.yaml b/k3d-default.yaml index ee7b7fc..31ad921 100644 --- a/k3d-default.yaml +++ b/k3d-default.yaml @@ -11,6 +11,14 @@ volumes: 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: diff --git a/k8s/infra/longhorn/Chart.yaml b/k8s/infra/longhorn/Chart.yaml index 0e0da97..9e13683 100644 --- a/k8s/infra/longhorn/Chart.yaml +++ b/k8s/infra/longhorn/Chart.yaml @@ -7,3 +7,5 @@ dependencies: - name: longhorn version: v1.4.0 repository: https://charts.longhorn.io + tags: + - "longhorn"