Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Exclude the .docker-cache directory
.docker-cache

# Exclude Git repository files
.git
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.windsor/
.volumes/
terraform/**/backend_override.tf
terraform/**/provider_override.tf
contexts/**/.terraform/
contexts/**/.tfstate/
contexts/**/.kube/
Expand Down
1 change: 1 addition & 0 deletions aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ packages:
- name: hashicorp/vault@v1.19.0
- name: derailed/k9s@v0.40.10
- name: getsops/sops@v3.9.4
- name: 1password/cli@v2.30.3
28 changes: 0 additions & 28 deletions contexts/colima/terraform/cluster/talos.tfvars

This file was deleted.

28 changes: 0 additions & 28 deletions contexts/docker-desktop/terraform/cluster/talos.tfvars

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
kind: Blueprint
apiVersion: blueprints.windsorcli.dev/v1alpha1
metadata:
name: colima
description: This blueprint configures core for running in a Colima managed VM
name: local
description: This blueprint outlines resources in the local context
repository:
url: http://git.test/git/core
ref:
branch: main
secretName: flux-system
sources:
- name: core
url: github.com/windsorcli/core
ref:
branch: main
sources: []
terraform:
- path: cluster/talos
- path: gitops/flux
Expand All @@ -29,6 +25,7 @@ kustomize:
path: csi
dependsOn:
- policy-resources
force: true
components:
- openebs
- openebs/dynamic-localpv
Expand Down
28 changes: 28 additions & 0 deletions contexts/local-colima/terraform/cluster/talos.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Managed by Windsor CLI: This file is partially managed by the windsor CLI. Your changes will not be overwritten.
// Module source: github.com/windsorcli/core//terraform/cluster/talos?ref=main

// The external controlplane API endpoint of the kubernetes API
cluster_endpoint = "https://controlplane-1.test:6443"

// The name of the cluster
cluster_name = "talos"

// A YAML string of common config patches to apply
common_config_patches = "\"cluster\":\n \"apiServer\":\n \"certSANs\":\n - \"localhost\"\n - \"controlplane-1.test\"\n - \"10.5.0.2\"\n \"extraManifests\":\n - \"https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/v0.8.7/deploy/standalone-install.yaml\"\n\"machine\":\n \"certSANs\":\n - \"localhost\"\n - \"controlplane-1.test\"\n - \"10.5.0.2\"\n \"features\":\n \"hostDNS\":\n \"forwardKubeDNSToHost\": true\n \"kubelet\":\n \"extraArgs\":\n \"rotate-server-certificates\": \"true\"\n \"network\": {}\n \"registries\":\n \"mirrors\":\n \"docker.io\":\n \"endpoints\":\n - \"http://registry-1.docker.test:5000\"\n \"gcr.io\":\n \"endpoints\":\n - \"http://gcr.test:5000\"\n \"ghcr.io\":\n \"endpoints\":\n - \"http://ghcr.test:5000\"\n \"quay.io\":\n \"endpoints\":\n - \"http://quay.test:5000\"\n \"registry.k8s.io\":\n \"endpoints\":\n - \"http://registry.k8s.test:5000\"\n \"registry.test\":\n \"endpoints\":\n - \"http://registry.test:5000\""

// Machine config details for control planes
controlplanes = [{
endpoint = "controlplane-1.test"
hostname = "controlplane-1.test"
node = "controlplane-1.test"
}]

// A YAML string of worker config patches to apply
worker_config_patches = "\"machine\":\n \"kubelet\":\n \"extraMounts\":\n - \"destination\": \"/var/local\"\n \"options\":\n - \"rbind\"\n - \"rw\"\n \"source\": \"/var/local\"\n \"type\": \"bind\""

// Machine config details for workers
workers = [{
endpoint = "worker-1.test"
hostname = "worker-1.test"
node = "worker-1.test"
}]
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
kind: Blueprint
apiVersion: blueprints.windsorcli.dev/v1alpha1
metadata:
name: docker-desktop
description: This blueprint configures core for running on Docker Desktop
name: local
description: This blueprint outlines resources in the local context
repository:
url: http://git.test/git/core
ref:
branch: main
secretName: flux-system
sources:
- name: core
url: github.com/windsorcli/core
ref:
branch: main
sources: []
terraform:
- path: cluster/talos
- path: gitops/flux
Expand All @@ -29,6 +25,7 @@ kustomize:
path: csi
dependsOn:
- policy-resources
force: true
components:
- openebs
- openebs/dynamic-localpv
Expand Down Expand Up @@ -80,10 +77,9 @@ kustomize:
components:
- webhook
- name: demo
path: demo
path: demo/bookinfo
dependsOn:
- ingress-base
force: true
components:
- bookinfo
- bookinfo/ingress
- ingress
28 changes: 28 additions & 0 deletions contexts/local-docker-desktop/terraform/cluster/talos.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Managed by Windsor CLI: This file is partially managed by the windsor CLI. Your changes will not be overwritten.
// Module source: github.com/windsorcli/core//terraform/cluster/talos?ref=main

// The external controlplane API endpoint of the kubernetes API
cluster_endpoint = "https://controlplane-1.test:6443"

// The name of the cluster
cluster_name = "talos"

// A YAML string of common config patches to apply
common_config_patches = "\"cluster\":\n \"apiServer\":\n \"certSANs\":\n - \"localhost\"\n - \"controlplane-1.test\"\n - \"10.5.0.2\"\n \"extraManifests\":\n - \"https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/v0.8.7/deploy/standalone-install.yaml\"\n\"machine\":\n \"certSANs\":\n - \"localhost\"\n - \"controlplane-1.test\"\n - \"10.5.0.2\"\n \"features\":\n \"hostDNS\":\n \"forwardKubeDNSToHost\": true\n \"kubelet\":\n \"extraArgs\":\n \"rotate-server-certificates\": \"true\"\n \"network\":\n \"interfaces\":\n - \"ignore\": true\n \"interface\": \"eth0\"\n \"registries\":\n \"mirrors\":\n \"docker.io\":\n \"endpoints\":\n - \"http://registry-1.docker.test:5000\"\n \"gcr.io\":\n \"endpoints\":\n - \"http://gcr.test:5000\"\n \"ghcr.io\":\n \"endpoints\":\n - \"http://ghcr.test:5000\"\n \"quay.io\":\n \"endpoints\":\n - \"http://quay.test:5000\"\n \"registry.k8s.io\":\n \"endpoints\":\n - \"http://registry.k8s.test:5000\"\n \"registry.test\":\n \"endpoints\":\n - \"http://registry.test:5000\""

// Machine config details for control planes
controlplanes = [{
endpoint = "controlplane-1.test"
hostname = "controlplane-1.test"
node = "controlplane-1.test"
}]

// A YAML string of worker config patches to apply
worker_config_patches = "\"machine\":\n \"kubelet\":\n \"extraMounts\":\n - \"destination\": \"/var/local\"\n \"options\":\n - \"rbind\"\n - \"rw\"\n \"source\": \"/var/local\"\n \"type\": \"bind\""

// Machine config details for workers
workers = [{
endpoint = "worker-1.test"
hostname = "worker-1.test"
node = "worker-1.test"
}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Managed by Windsor CLI: This file is partially managed by the windsor CLI. Your changes will not be overwritten.
// Module source: github.com/windsorcli/core//terraform/gitops/flux?ref=v0.1.2
// Module source: github.com/windsorcli/core//terraform/gitops/flux?ref=main

// The git password or PAT used to authenticate with the git provider
git_password = "local"
Expand Down
25 changes: 25 additions & 0 deletions terraform/cluster/talos/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions terraform/gitops/flux/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions windsor.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: v1alpha1
contexts:
colima:
local-colima:
docker:
enabled: true
registries:
Expand Down Expand Up @@ -43,6 +43,11 @@ contexts:
count: 1
cpu: 4
memory: 4
hostports:
- 8080:30080/tcp
- 8443:30443/tcp
- 9292:30292/tcp
- 8053:30053/udp
volumes:
- ${WINDSOR_PROJECT_ROOT}/.volumes:/var/local
network:
Expand All @@ -53,9 +58,7 @@ contexts:
dns:
enabled: true
domain: test
forward:
- 10.5.1.1
docker-desktop:
local-docker-desktop:
docker:
enabled: true
registries:
Expand Down Expand Up @@ -99,8 +102,8 @@ contexts:
cpu: 4
memory: 4
hostports:
- 80:30080/tcp
- 443:30443/tcp
- 8080:30080/tcp
- 8443:30443/tcp
- 9292:30292/tcp
- 8053:30053/udp
volumes:
Expand All @@ -110,5 +113,3 @@ contexts:
dns:
enabled: true
domain: test
forward:
- 10.5.0.1:8053