DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases 1 Wiki Activity

fix(clustertool): fix git references issues and warn against ARM

Browse Source
This commit is contained in:
Kjeld Schouten
2024-11-03 18:25:37 +01:00
parent 250d3e8adc
commit b5f59a629c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clustertool/embed/generic/base/clusterenv.yaml
+3 -1
View File
@@ -1,7 +1,8 @@
## The Following are required by ClusterTool and CANNOT be removed ## The Following are required by ClusterTool and CANNOT be removed
# Ensure VIP is different from all master IPs # Ensure VIP is different from all master IPs
VIP: 192.168.20.200 VIP: 192.168.20.200
# Defines the MasterNode IP ## Defines the MasterNode IP
# Please be aware, we only support x86_64 for the first node, ARM will NOT work by default
MASTER1IP: 192.168.20.210 MASTER1IP: 192.168.20.210
# Defines the gateway for all nodes # Defines the gateway for all nodes
GATEWAY: 192.168.20.1 GATEWAY: 192.168.20.1
@@ -11,6 +12,7 @@ METALLB_RANGE: 192.168.20.211-192.168.20.219
DASHBOARD_IP: 192.168.20.211 DASHBOARD_IP: 192.168.20.211
# Used to automatically generate a sshkey-pair for FluxCD # Used to automatically generate a sshkey-pair for FluxCD
# Has to start with ssh:// # Has to start with ssh://
# Please make sure to NOT contain any special characters in the URL except "-"
GITHUB_REPOSITORY: "" GITHUB_REPOSITORY: ""
## Uncomment and adapt to automatically setup your dockerhub credentials ## Uncomment and adapt to automatically setup your dockerhub credentials
## This should prevent much of the potential ratelimits ## This should prevent much of the potential ratelimits
clustertool/pkg/initfiles/initfiles.go
+1 -1
View File
@@ -127,7 +127,7 @@ func FormatGitURL(input string) string {
} }
// Compile a regex to match and replace the URL pattern // Compile a regex to match and replace the URL pattern
re := regexp.MustCompile(`^ssh://git@([^:/]+)([:/])(\w+)/(\w+)\.git$`) re := regexp.MustCompile(`^ssh://git@([^:/]+)([:/])([\w-]+)/([\w-]+)\.git$`)
matches := re.FindStringSubmatch(input) matches := re.FindStringSubmatch(input)
if len(matches) == 5 { if len(matches) == 5 {