Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20231103 release to develop #284

Merged
merged 8 commits into from
Nov 3, 2023
22 changes: 9 additions & 13 deletions lma/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: kube-prometheus-stack
version: 44.3.1
version: 48.3.1
origin: https://prometheus-community.github.io/helm-charts
helmVersion: v3
releaseName: prometheus-operator-crds
Expand All @@ -29,7 +29,7 @@ spec:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: kube-prometheus-stack
version: 44.3.1
version: 48.3.1
origin: https://prometheus-community.github.io/helm-charts
releaseName: prometheus-operator
targetNamespace: lma
Expand Down Expand Up @@ -71,29 +71,25 @@ spec:
enabled: true
image:
repository: tks/prometheus-operator
tag: v0.52.0
tag: v0.66.0
admissionWebhooks:
patch:
image:
repository: tks/kube-webhook-certgen
tag: v1.0
tag: v20221220-controller-v1.5.1-58-g787ea74b6
prometheusConfigReloader:
image:
repository: tks/prometheus-config-reloader
tag: v0.52.0
tag: v0.66.0
thanosImage:
repository: tks/thanos
tag: v0.30.2
tag: v0.31.0
nodeSelector: {} # TO_BE_FIXED
createCustomResource: true
cleanupCustomResource: true
cleanupCustomResourceBeforeInstall: true
prometheus:
enabled: false
prometheusSpec:
image:
repository: tks/prometheus
tag: v2.31.1
wait: true
---
apiVersion: helm.fluxcd.io/v1
Expand All @@ -108,7 +104,7 @@ spec:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: kube-prometheus-stack
version: 44.3.1
version: 48.3.1
origin: https://prometheus-community.github.io/helm-charts
releaseName: prometheus
targetNamespace: lma
Expand All @@ -123,7 +119,7 @@ spec:
alertmanagerSpec:
image:
repository: tks/alertmanager
tag: v0.23.0
tag: v0.25.0
nodeSelector: {} # TO_BE_FIXED
retention: TO_BE_FIXED

Expand Down Expand Up @@ -238,7 +234,7 @@ spec:
prometheusSpec:
image:
repository: tks/prometheus
tag: v2.31.1
tag: v2.45.0
retention: TO_BE_FIXED
storageSpec:
volumeClaimTemplate:
Expand Down
30 changes: 30 additions & 0 deletions service-mesh/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -718,3 +718,33 @@ spec:
optimization:
interval: "5s"
wait: true
---
apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
labels:
name: gatekeeper
name: gatekeeper
spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: gatekeeper
version: 0.1.39
origin: https://gogatekeeper.github.io/helm-gogatekeeper
releaseName: gatekeeper
targetNamespace: tks-msa
values:
image:
registry: harbor.taco-cat.xyz
repository: tks/gatekeeper
service:
type: LoadBalancer
config:
discovery-url: https://tks-console-dev.taco-cat.xyz/auth/realms/organization
upstream-url: http://jaeger-operator-jaeger-query.tks-msa.svc:16686
client-id: gatekeeper-jaeger
client-secret: secret
wait: true

13 changes: 12 additions & 1 deletion service-mesh/base/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ global:
tks-egressgateway: enabled
ingressGatewayLabel: istio-ingressgateway
egressGatewayLabel: istio-egressgateway
keycloakIssuerUri: https://keycloak.com/auth/realms/oraganization
keycloakClientPrefix: client-prefix
gatekeeperSecret: gatekeeper-secret

charts:
- name: cert-manager
Expand Down Expand Up @@ -96,7 +99,7 @@ charts:
global.hub: $(imageRepo)
global.proxy.clusterDomain: $(clusterName)
global.tracer.zipkin.address: jaeger-operator-jaeger-collector.$(namespace):9411

- name: istio-ingressgateway
override:
revision: ""
Expand Down Expand Up @@ -242,3 +245,11 @@ charts:
namespace: tks-msa
aggregation.interval: "15s"
optimization.interval: "15s"

- name: gatekeeper
override:
config:
discovery-url: $(keycloakIssuerUri)
client-id: $(keycloakClientPrefix)-gatekeeper-jaeger
client-secret: $(gatekeeperSecret)

4 changes: 0 additions & 4 deletions tks-admin-tools/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ spec:
enabled: true
ingressClassName: nginx # tunable
hostname: TO_BE_FIXED
annotations:
nginx.ingress.kubernetes.io/proxy-buffer-size: 20k
acme.cert-manager.io/http01-edit-in-place: "true"
cert-manager.io/cluster-issuer: http0issuer
tls: true
selfSigned: false
cache:
Expand Down