Skip to content

Commit 7ec0bde

Browse files
committed
Install replicated release as customer
1 parent 832baa5 commit 7ec0bde

File tree

6 files changed

+25
-15
lines changed

6 files changed

+25
-15
lines changed

applications/wg-easy/Taskfile.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ tasks:
175175
helm-install:
176176
desc: Install all charts using helmfile
177177
silent: false
178+
vars:
179+
LICENSE_ID: '{{.LICENSE_ID | default "2cmqT1dBVHZ3aSH21kPxWtgoYGr"}}'
178180
cmds:
179181
- echo "Installing all charts via helmfile"
180182
- |
@@ -189,8 +191,11 @@ tasks:
189191
ENV_VARS=$(task utils:port-operations OPERATION=getenv CLUSTER_NAME={{.CLUSTER_NAME}})
190192
191193
# Deploy with helmfile
194+
helm registry logout registry.replicated.com || true
195+
helm registry login registry.replicated.com --username [email protected] --password {{.LICENSE_ID}}
192196
echo "Using $ENV_VARS"
193197
eval "KUBECONFIG={{.KUBECONFIG_FILE}} $ENV_VARS helmfile sync --wait"
198+
helm registry logout registry.replicated.com
194199
- echo "All charts installed!"
195200
deps:
196201
- setup-kubeconfig
@@ -230,7 +235,7 @@ tasks:
230235

231236
# Copy all non-config.yaml files
232237
- echo "Copying non-config YAML files to release folder..."
233-
- find . -path '*/replicated/*.yaml' -not -name 'config.yaml' -exec cp {} ./release/ \;
238+
- find . -path './charts/*/replicated/*.yaml' -exec cp {} ./release/ \;
234239
- find ./replicated -name '*.yaml' -not -name 'config.yaml' -exec cp {} ./release/ \; 2>/dev/null || true
235240

236241
# extract namespaces from helmChart files

applications/wg-easy/charts/replicated-sdk/Chart.yaml renamed to applications/wg-easy/charts/replicated/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: replicated-sdk
1+
name: replicated
22
version: 1.0.0
33
apiVersion: v2
44
dependencies:
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: kots.io/v1beta2
22
kind: HelmChart
33
metadata:
4-
name: replicated-sdk
4+
name: replicated
55
spec:
66
chart:
7-
name: replicated-sdk
7+
name: replicated
88
weight: 1
99

1010
# helmUpgradeFlags specifies additional flags to pass to the `helm upgrade` command.
@@ -16,5 +16,5 @@ spec:
1616
- --wait
1717

1818
values: {}
19-
namespace: replicated-sdk
19+
namespace: replicated
2020
builder: {}

applications/wg-easy/helmfile.yaml.gotmpl

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ environments:
1414
certManagerIssuers: ./charts/cert-manager-issuers
1515
traefik: ./charts/traefik
1616
wgEasy: ./charts/wg-easy
17-
replicatedSDK: ./charts/replicated-sdk
17+
replicatedSDK: ./charts/replicated
1818
- extras:
1919
enableReplicatedSDK: false
2020
replicated:
2121
values:
22-
- app: '{{ env "APP" | default "wg-easy" }}'
23-
- channel: '{{ env "CHANNEL" | default "Unstable" }}'
22+
- app: '{{ env "REPLICATED_APP" | default "wg-easy" }}'
23+
- channel: '{{ env "CHANNEL" | default "unstable" }}'
2424
- chartSources:
25-
certManager: 'oci://registry.replicated.com/{{ env "APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "Unstable" }}/cert-manager'
26-
certManagerIssuers: 'oci://registry.replicated.com/{{ env "APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "Unstable" }}/cert-manager-issuers'
27-
traefik: 'oci://registry.replicated.com/{{ env "APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "Unstable" }}/traefik'
28-
wgEasy: 'oci://registry.replicated.com/{{ env "APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "Unstable" }}/wg-easy'
29-
replicatedSDK: 'oci://registry.replicated.com/{{ env "APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "Unstable" }}/replicated-sdk'
25+
certManager: 'oci://registry.replicated.com/{{ env "REPLICATED_APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "unstable" }}/cert-manager'
26+
certManagerIssuers: 'oci://registry.replicated.com/{{ env "REPLICATED_APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "unstable" }}/cert-manager-issuers'
27+
traefik: 'oci://registry.replicated.com/{{ env "REPLICATED_APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "unstable" }}/traefik'
28+
wgEasy: 'oci://registry.replicated.com/{{ env "REPLICATED_APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "unstable" }}/wg-easy'
29+
replicatedSDK: 'oci://registry.replicated.com/{{ env "REPLICATED_APP" | default "wg-easy" }}/{{ env "CHANNEL" | default "unstable" }}/replicated'
3030
- extras:
3131
enableReplicatedSDK: true
3232
---
@@ -35,6 +35,7 @@ releases:
3535
- name: cert-manager
3636
namespace: cert-manager
3737
chart: {{ .Values.chartSources.certManager }}
38+
version: 1.0.0
3839
createNamespace: true
3940
wait: true
4041
installed: true
@@ -44,6 +45,7 @@ releases:
4445
- name: cert-manager-issuers
4546
namespace: cert-manager
4647
chart: {{ .Values.chartSources.certManagerIssuers }}
48+
version: 1.0.0
4749
createNamespace: true
4850
wait: true
4951
installed: true
@@ -54,6 +56,7 @@ releases:
5456
- name: traefik
5557
namespace: traefik
5658
chart: {{ .Values.chartSources.traefik }}
59+
version: 1.0.0
5760
createNamespace: true
5861
wait: true
5962
installed: true
@@ -69,9 +72,10 @@ releases:
6972
nodePort: 30443
7073

7174
# Install replicated-sdk (only in replicated environment)
72-
- name: replicated-sdk
73-
namespace: replicated-sdk
75+
- name: replicated
76+
namespace: replicated
7477
chart: {{ .Values.chartSources.replicatedSDK }}
78+
version: 1.0.0
7579
createNamespace: true
7680
wait: true
7781
installed: {{ .Values.extras.enableReplicatedSDK }}
@@ -82,6 +86,7 @@ releases:
8286
- name: wg-easy
8387
namespace: wg-easy
8488
chart: {{ .Values.chartSources.wgEasy }}
89+
version: 1.0.0
8590
createNamespace: true
8691
wait: true
8792
installed: true

0 commit comments

Comments
 (0)