Skip to content

Commit

Permalink
feat!: add mandatory cloudflare tunnel support (#716)
Browse files Browse the repository at this point in the history
Co-authored-by: Devin Buhl <[email protected]>
  • Loading branch information
buroa and onedr0p committed May 4, 2023
1 parent b917ecc commit 145f575
Show file tree
Hide file tree
Showing 34 changed files with 525 additions and 568 deletions.
9 changes: 8 additions & 1 deletion .config.sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@ export BOOTSTRAP_WEAVE_GITOPS_ADMIN_PASSWORD="generated" # NOTE: Must only conta
export BOOTSTRAP_CLOUDFLARE_DOMAIN=""
# The email you use to sign into Cloudflare with
export BOOTSTRAP_CLOUDFLARE_EMAIL=""
# Your global Cloudflare API Key
# Your global Cloudflare API Key (not API token)
export BOOTSTRAP_CLOUDFLARE_APIKEY=""

# Create a cloudflare tunnel to automatically ingress into your cluster
# https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-guide/local/
# cloudflared tunnel create <NAME or UUID>
export BOOTSTRAP_CLOUDFLARE_ACCOUNT_TAG=""
export BOOTSTRAP_CLOUDFLARE_TUNNEL_SECRET=""
export BOOTSTRAP_CLOUDFLARE_TUNNEL_ID=""

# Pick a range of unused IPs that are on the same network as your nodes
# You don't need many IPs, just choose 10 IPs to start with
# e.g. 192.168.1.220-192.168.1.230
Expand Down
2 changes: 0 additions & 2 deletions .github/labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ area/github:
- ".github/**/*"
area/kubernetes:
- "kubernetes/**/*"
area/terraform:
- "terraform/**/*"
area/templates:
- "tmpl/**/*"
6 changes: 0 additions & 6 deletions .github/labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
color: "72ccf3"
description: >-
Changes made in the tmpl directory
- name: area/terraform
color: "72ccf3"
description: >-
Changes made in the terraform directory
# Renovate
- name: renovate/ansible
color: "ffc300"
Expand All @@ -31,8 +27,6 @@
color: "ffc300"
- name: renovate/helm
color: "ffc300"
- name: renovate/terraform
color: "ffc300"
# Semantic Type
- name: type/patch
color: "FFEC19"
Expand Down
2 changes: 0 additions & 2 deletions .github/release-drafter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ categories:
labels: ["area/github"]
- title: "Ansible"
labels: ["area/ansible"]
- title: "Terraform"
labels: ["area/terraform"]
- title: "Maintenance"
labels: ["docs"]
version-resolver:
Expand Down
4 changes: 0 additions & 4 deletions .github/renovate/labels.json5
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
"matchDatasources": ["galaxy", "galaxy-collection"],
"addLabels": ["renovate/ansible"]
},
{
"matchDatasources": ["terraform-provider"],
"addLabels": ["renovate/terraform"]
},
{
"matchDatasources": ["github-releases", "github-tags"],
"addLabels": ["renovate/github-release"]
Expand Down
19 changes: 0 additions & 19 deletions .github/renovate/semanticCommits.json5
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"semanticCommitType": "feat",
"semanticCommitScope": "helm"
},

{
"matchDatasources": ["helm"],
"matchUpdateTypes": ["patch"],
Expand All @@ -53,30 +52,12 @@
"semanticCommitType": "feat",
"semanticCommitScope": "ansible"
},

{
"matchDatasources": ["galaxy", "galaxy-collection"],
"matchUpdateTypes": ["patch"],
"semanticCommitType": "fix",
"semanticCommitScope": "ansible"
},
{
"matchDatasources": ["terraform-provider"],
"matchUpdateTypes": ["major"],
"commitMessagePrefix": "feat(terraform)!: "
},
{
"matchDatasources": ["terraform-provider"],
"matchUpdateTypes": ["minor"],
"semanticCommitType": "feat",
"semanticCommitScope": "terraform"
},
{
"matchDatasources": ["terraform-provider"],
"matchUpdateTypes": ["patch"],
"semanticCommitType": "fix",
"semanticCommitScope": "terraform"
},
{
"matchDatasources": ["github-releases", "github-tags"],
"matchUpdateTypes": ["major"],
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ kubeconfig
*.key
# Ansible
xanmanning.k3s*
# Terraform
.terraform
.terraform.tfstate*
terraform.tfstate*
4 changes: 0 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ repos:
- --config-file
- .yamllint.yaml
id: yamllint
- repo: https://github.com/gruntwork-io/pre-commit
rev: v0.1.21
hooks:
- id: terraform-fmt
22 changes: 0 additions & 22 deletions .taskfiles/TerraformTasks.yml

This file was deleted.

1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"signageos.signageos-vscode-sops",
"will-stone.in-any-case",
"EditorConfig.editorconfig",
"HashiCorp.terraform",
"PKief.material-icon-theme",
]
}
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"**/ansible/**/*.yml": "ansible",
"**/ansible/**/*.sops.yml": "yaml",
"**/ansible/**/inventory/**/*.yml": "yaml",
"**/terraform/**/*.tf": "terraform",
"**/kubernetes/**/*.sops.toml": "plaintext"
},
"yaml.schemas": {
Expand Down
Loading

0 comments on commit 145f575

Please sign in to comment.