Skip to content

Commit

Permalink
fix(clustertool): fix git references issues and warn against ARM
Browse files Browse the repository at this point in the history
  • Loading branch information
PrivatePuffin committed Nov 3, 2024
1 parent 250d3e8 commit b5f59a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion clustertool/embed/generic/base/clusterenv.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## The Following are required by ClusterTool and CANNOT be removed
# Ensure VIP is different from all master IPs
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
# Defines the gateway for all nodes
GATEWAY: 192.168.20.1
Expand All @@ -11,6 +12,7 @@ METALLB_RANGE: 192.168.20.211-192.168.20.219
DASHBOARD_IP: 192.168.20.211
# Used to automatically generate a sshkey-pair for FluxCD
# Has to start with ssh://
# Please make sure to NOT contain any special characters in the URL except "-"
GITHUB_REPOSITORY: ""
## Uncomment and adapt to automatically setup your dockerhub credentials
## This should prevent much of the potential ratelimits
Expand Down
2 changes: 1 addition & 1 deletion clustertool/pkg/initfiles/initfiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func FormatGitURL(input string) string {
}

// 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)

if len(matches) == 5 {
Expand Down

0 comments on commit b5f59a6

Please sign in to comment.