Update settings dor ArgoCD #20

Merged
allanger merged 6 commits from refs/pull/20/head into main 2023-02-26 17:38:10 +00:00
6 changed files with 84 additions and 6 deletions

View File

@ -49,10 +49,14 @@ server:
policy.csv: | policy.csv: |
g, allanger@zohomail.com, role:admin g, allanger@zohomail.com, role:admin
g, rodion.n.rodionov@gmail.com, role:admin g, rodion.n.rodionov@gmail.com, role:admin
p, drone, applications, get, */*,allow
p, drone, applications, sync, */*,allow
config: config:
exec.enabled: "true" exec.enabled: "true"
url: https://argo.badhouseplants.net url: https://argo.badhouseplants.net
kustomize.buildOptions: "--enable-alpha-plugins" kustomize.buildOptions: "--enable-alpha-plugins"
accounts.drone: apiKey, login
accounts.drone.enabled: "true"
extraArgs: extraArgs:
- --insecure - --insecure

View File

@ -1,5 +1,39 @@
ns:
enabled: true
name: gitea-service
istio:
enabled: true
istio:
- name: gitea-http
gateway: badhouseplants-net
hostname: git.badhouseplants.net
service: gitea-http
port: 3000
templates:
- |
{{ range .Values.istio }}
apiVersion: networking.istio.io/v1beta1
kind: VirtualService
metadata:
name: {{ .name }}
spec:
gateways:
- "istio-system/{{ .gateway }}"
hosts:
- {{ .hostname }}
http:
- match:
- uri:
prefix: /
route:
- destination:
host: {{ .service }}
port:
number: {{ .port }}
{{ end }}
replicaCount: 1 replicaCount: 1
clusterDomain: cluster.local clusterDomain: cluster.local
resources: resources:
limits: limits:
cpu: 300m cpu: 300m
@ -7,6 +41,7 @@ resources:
requests: requests:
cpu: 100m cpu: 100m
memory: 128Mi memory: 128Mi
persistence: persistence:
enabled: true enabled: true
size: 10Gi size: 10Gi
@ -14,10 +49,12 @@ persistence:
- ReadWriteOnce - ReadWriteOnce
labels: {} labels: {}
annotations: {} annotations: {}
memcached: memcached:
enabled: true enabled: true
service: service:
port: 11211 port: 11211
postgresql: postgresql:
auth: auth:
postgresPassword: check postgresPassword: check
@ -27,8 +64,10 @@ postgresql:
servicePort: 5432 servicePort: 5432
persistence: persistence:
size: 10Gi size: 10Gi
ingress: ingress:
enabled: false enabled: false
gitea: gitea:
config: config:
APP_NAME: Bad Houseplants Gitea APP_NAME: Bad Houseplants Gitea

8
common/values.ns.yaml Normal file
View File

@ -0,0 +1,8 @@
ns:
templates:
- |
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.name }}

View File

@ -1,5 +1,5 @@
environments: environments:
badhouseplants: badhouseplants:
kubeContext: allanger@badhouseplants-microk8s # kubeContext: allanger@badhouseplants-microk8s
etersoft: etersoft:
kubeContext: allanger@etersoft kubeContext: allanger@etersoft

View File

@ -1,5 +1,8 @@
--- ---
templates: templates:
# ---------------------------
# -- Hooks
# ---------------------------
crd-management-hook: crd-management-hook:
hooks: hooks:
- events: ["preapply"] - events: ["preapply"]
@ -20,6 +23,12 @@ templates:
args: args:
- -c - -c
- "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -" - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -"
# ----------------------------
# -- Configs
# ----------------------------
default-common-values:
values:
- "{{ requiredEnv \"PWD\" }}/commmon/values.{{ .Release.Name }}.yaml"
default-env-values: default-env-values:
values: values:
- "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
@ -27,6 +36,21 @@ templates:
secrets: secrets:
- "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml" - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml"
# ---------------------------- # ----------------------------
# -- Extensions
# ----------------------------
istio-resource:
dependencies:
- chart: bedag/raw
version: 2.0.0
alias: istio
namespace:
dependencies:
- chart: bedag/raw
version: 2.0.0
alias: ns
values:
- "{{ requiredEnv \"PWD\" }}/common/values.ns.yaml"
# ----------------------------
# -- Releases # -- Releases
# ---------------------------- # ----------------------------
# -- System # -- System
@ -62,7 +86,9 @@ templates:
# ---------------------------- # ----------------------------
# -- Istio # -- Istio
# ---------------------------- # ----------------------------
istio-version: istio-common:
labels:
bundle: istio
version: 1.16.1 version: 1.16.1
istio-base: &istio-base istio-base: &istio-base
@ -70,20 +96,20 @@ templates:
chart: istio/base chart: istio/base
inherit: inherit:
- template: crd-management-hook - template: crd-management-hook
- template: istio-version - template: istio-common
istio-gateway: &istio-gateway istio-gateway: &istio-gateway
name: istio-ingressgateway name: istio-ingressgateway
chart: istio/gateway chart: istio/gateway
inherit: inherit:
- template: istio-version - template: istio-common
- template: default-env-values - template: default-env-values
istiod: &istiod istiod: &istiod
name: istiod name: istiod
chart: istio/istiod chart: istio/istiod
inherit: inherit:
- template: istio-version - template: istio-common
- template: default-env-values - template: default-env-values
# ---------------------------- # ----------------------------

View File

@ -24,4 +24,5 @@ repositories:
url: https://ananace.gitlab.io/charts url: https://ananace.gitlab.io/charts
- name: argo - name: argo
url: https://argoproj.github.io/argo-helm url: https://argoproj.github.io/argo-helm
- name: bedag
url: https://bedag.github.io/helm-charts/