Merge branch 'main' of https://git.forteapps.net/Forte/launchpad into feature/multicluster
This commit is contained in:
@@ -48,10 +48,10 @@ spec:
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
memory: 64Mi
|
||||
memory: 128Mi
|
||||
limits:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
memory: 256Mi
|
||||
|
||||
# Service account
|
||||
serviceAccount:
|
||||
|
||||
@@ -15,9 +15,11 @@ spec:
|
||||
project: default
|
||||
|
||||
source:
|
||||
repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
path: cluster-resources
|
||||
directory:
|
||||
exclude: 'network'
|
||||
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
|
||||
@@ -16,7 +16,7 @@ metadata:
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
path: apps/overlays/eu
|
||||
destination:
|
||||
|
||||
@@ -23,7 +23,7 @@ spec:
|
||||
valueFiles:
|
||||
- $values/infra/values/base/fluent-bit-values.yaml
|
||||
|
||||
- repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
- repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
ref: values
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ spec:
|
||||
- $values/infra/values/base/grafana-values.yaml
|
||||
- $values/infra/values/eu/grafana-values.yaml
|
||||
|
||||
- repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
- repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
ref: values
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ spec:
|
||||
- $values/infra/values/base/keycloak-values.yaml
|
||||
- $values/infra/values/eu/keycloak-values.yaml
|
||||
|
||||
- repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
- repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
ref: values
|
||||
|
||||
@@ -41,3 +41,9 @@ spec:
|
||||
- CreateNamespace=true
|
||||
- Validate=true
|
||||
- ServerSideApply=true
|
||||
|
||||
ignoreDifferences:
|
||||
- group: batch
|
||||
kind: CronJob
|
||||
jsonPointers:
|
||||
- /spec/jobTemplate/spec/template/spec/containers/0/args
|
||||
|
||||
@@ -15,7 +15,7 @@ spec:
|
||||
project: default
|
||||
|
||||
source:
|
||||
repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
path: cluster-resources/policies
|
||||
|
||||
|
||||
@@ -39,6 +39,10 @@ spec:
|
||||
targetRevision: v3.7.0 # Update to latest stable version
|
||||
helm:
|
||||
releaseName: kyverno
|
||||
valuesObject:
|
||||
grafana:
|
||||
enabled: true
|
||||
namespace: monitoring
|
||||
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
|
||||
@@ -23,7 +23,7 @@ spec:
|
||||
valueFiles:
|
||||
- $values/infra/values/base/loki-values.yaml
|
||||
|
||||
- repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
- repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
ref: values
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ spec:
|
||||
valueFiles:
|
||||
- $values/infra/values/base/prometheus-values.yaml
|
||||
|
||||
- repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
- repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
targetRevision: HEAD
|
||||
ref: values
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ metadata:
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: git@github.com:fortedigital/sturdy-adventure.git
|
||||
repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
|
||||
path: secrets/eu
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
|
||||
Reference in New Issue
Block a user