Skip to content

Commit d967cce

Browse files
committed
rebase me
1 parent 8dae310 commit d967cce

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

applications/wg-easy/Taskfile.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ tasks:
202202
silent: true
203203
vars:
204204
HELM_ENV: '{{.HELM_ENV | default "default"}}'
205-
requires:
206-
vars: [REPLICATED_LICENSE_ID]
207205
cmds:
208206
- echo "Installing all charts via helmfile"
209207
- |

applications/wg-easy/charts/traefik/values.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ traefik:
77
service:
88
type: NodePort
99
ports:
10-
web:
11-
nodePort: 80
12-
redirectTo:
13-
port: websecure
1410
websecure:
15-
nodePort: 443
11+
nodePort: 30443
1612
tlsStore:
1713
default:
1814
certificates:

applications/wg-easy/helmfile.yaml.gotmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
helmDefaults:
33
verify: false
44
wait: true
5-
timeout: 600
5+
timeout: 100
66
atomic: true
77
cleanupOnFail: true
88

@@ -32,12 +32,14 @@ environments:
3232
- extras:
3333
enableReplicatedSDK: true
3434
---
35+
{{- if eq .Environment.Name "replicated" }}
3536
repositories:
3637
- name: registry.replicated.com
3738
oci: true
3839
url: registry.replicated.com
3940
username: '{{ .Values.username }}'
4041
password: '{{ .Values.password }}'
42+
{{- end }}
4143

4244
releases:
4345
# Install cert-manager with CRDs but without issuers
@@ -75,8 +77,6 @@ releases:
7577
values:
7678
- traefik:
7779
ports:
78-
web:
79-
nodePort: 30080
8080
websecure:
8181
nodePort: 30443
8282

applications/wg-easy/taskfiles/utils.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,13 @@ tasks:
114114
# Get TF_EXPOSED_URL for HTTPS
115115
TF_EXPOSED_URL=$(replicated cluster port ls $CLUSTER_ID --output json | jq -r '.[] | select(.upstream_port == 30443 and .exposed_ports[0].protocol == "https") | .hostname' | head -n 1)
116116
117-
# Get TF_EXPOSED_HTTP_URL for HTTP
118-
TF_EXPOSED_HTTP_URL=$(replicated cluster port ls $CLUSTER_ID --output json | jq -r '.[] | select(.upstream_port == 30080 and .exposed_ports[0].protocol == "http") | .hostname' | head -n 1)
119-
120117
if [ -z "$TF_EXPOSED_URL" ]; then
121118
echo "Error: Could not determine TF_EXPOSED_URL. HTTPS port is not properly exposed."
122119
echo "Please ensure the HTTPS port is exposed before deploying."
123120
exit 1
124121
fi
125122
126-
if [ -z "$TF_EXPOSED_HTTP_URL" ]; then
127-
echo "Error: Could not determine TF_EXPOSED_HTTP_URL. HTTP port is not properly exposed."
128-
echo "Please ensure the HTTP port is exposed before deploying."
129-
exit 1
130-
fi
131-
132-
echo "TF_EXPOSED_URL=$TF_EXPOSED_URL TF_EXPOSED_HTTP_URL=$TF_EXPOSED_HTTP_URL"
123+
echo "TF_EXPOSED_URL=$TF_EXPOSED_URL"
133124
fi
134125
135126
vendor-api-auth:

0 commit comments

Comments
 (0)