using global everywhere

This commit is contained in:
ari committed 2023-03-14 21:52:23 +00:00
1 parent d9feffdaa3
commit ba4d01a0d1
7 files changed
+56 -37

No files matched your search

+3 -1
View File
@@ -6,5 +6,7 @@ helm template argocd k8s/argocd \
--namespace argocd \
--create-namespace \
--values k8s/argocd/values.yaml \
--values k8s/argocd/values-dev.yaml \
--set selfapp.enabled="true" \
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" > .tmp/argocd.yaml
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \
> .tmp/argocd.yaml
+7 -4
View File
@@ -5,14 +5,17 @@ pushd k8s/argocd
helm dependency update
DEPLOYMENT=dev
popd
helm install argocd k8s/argocd \
--namespace argocd \
--create-namespace \
--values k8s/argocd/values.yaml \
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \
--set selfapp.deployment=dev
--values k8s/argocd/values-$DEPLOYMENT.yaml \
--set selfapp.enabled="true" \
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)"
watch -n1 "kubectl -n argocd get all"
@@ -24,6 +27,6 @@ helm upgrade argocd k8s/argocd \
--namespace argocd \
--create-namespace \
--values k8s/argocd/values.yaml \
--values k8s/argocd/values-$DEPLOYMENT.yaml \
--set selfapp.enabled="true" \
--set selfapp.deployment=dev \
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)"
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)"
+6 -3
View File
@@ -1,9 +1,12 @@
#!/bin/bash
DEPLOYMENT=dev
helm upgrade argocd k8s/argocd \
--debug \
--namespace argocd \
--create-namespace \
--values k8s/argocd/values.yaml \
--set selfapp.deployment=dev \
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \
--set selfapp.enabled="true"
--values k8s/argocd/values-$DEPLOYMENT.yaml \
--set selfapp.enabled="true" \
--set selfapp.sshkey="$(cat ~/.ssh/id_rsa)"
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
helm:
valueFiles:
- values.yaml
- values-{{ .Values.selfapp.deployment }}.yaml
- values-{{ .Values.global.deployment }}.yaml
parameters:
- name: "selfapp.enabled"
value: "true"
+2 -2
View File
@@ -22,8 +22,8 @@ spec:
path: '{{ `{{path}}` }}'
helm:
values: |-
global:
domain: "{{ .Values.selfapp.domain }}"
global:
{{- .Values.global | toYaml | nindent 28 }}
valueFiles:
- values.yaml
- values-{{ .Values.selfapp.deployment }}.yaml
+36 -25
View File
@@ -1,25 +1,36 @@
# ---
# apiVersion: traefik.containo.us/v1alpha1
# kind: IngressRoute
# metadata:
# name: argocd-server
# namespace: argocd
# spec:
# entryPoints:
# - websecure
# routes:
# - kind: Rule
# match: Host(`argocd.{{ .Values.selfapp.domain }}`)
# priority: 10
# services:
# - name: argocd-server
# port: 80
# - kind: Rule
# match: Host(`argocd.{{ .Values.selfapp.domain }}`) && Headers(`Content-Type`, `application/grpc`)
# priority: 11
# services:
# - name: argocd-server
# port: 80
# scheme: h2c
# tls:
# certResolver: default
---
apiVersion: v1
items:
- apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: argocd-server-grpc
namespace: argocd
spec:
rules:
- http:
paths:
- backend:
service:
name: argocd-server
port:
number: 80
path: /
pathType: Prefix
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: argocd-server
namespace: argocd
spec:
rules:
- http:
paths:
- backend:
service:
name: argocd-server
port:
number: 443
path: /argocd
pathType: Prefix
+1 -1
View File
@@ -1,3 +1,3 @@
selfapp:
global:
deployment: dev
domain: "me.local"