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

Feature/ingress dns #278

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added ssl settings
  • Loading branch information
ohrebeniuk committed Nov 20, 2024
commit 3f71e364b7b0ada2d61d1be4e71b6cea8d790b37
2 changes: 1 addition & 1 deletion src/digma/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
# version: this Chart version
version: 1.0.256
version: 1.0.259
name: digma
description: A Helm chart containing Digma's services and dbs
home: https://github.com/digma-ai/digma
Expand Down
30 changes: 24 additions & 6 deletions src/digma/templates/external-network.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,36 @@ spec:

---

apiVersion: v1
kind: Secret
metadata:
name: {{ .Release.Name }}-tls-secret
namespace: {{ .Release.Namespace }}
type: kubernetes.io/tls
data:
tls.crt: {{ .Values.tls.crt | b64enc | quote }}
tls.key: {{ .Values.tls.key | b64enc | quote }}

---

# Ingress Resource
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Release.Name }}-ingress
namespace: {{ .Release.Namespace }}
annotations:
nginx.ingress.kubernetes.io/ssl-redirect: "true"
spec:
ingressClassName: nginx
tls:
- hosts:
- api.{{ .Values.ingressController.host }}
- jaeger.{{ .Values.ingressController.host }}
- collector.{{ .Values.ingressController.host }}
secretName: {{ .Release.Name }}-tls-secret
rules:
- host: jaeger.{{- if .Values.ingressController.host }}
- host: jaeger.{{ .Values.ingressController.host }}
http:
paths:
- path: /
Expand All @@ -75,7 +95,7 @@ spec:
name: {{ .Release.Name }}-embedded-jaeger
port:
number: 16686
- host: api.{{- if .Values.ingressController.host }}
- host: api.{{ .Values.ingressController.host }}
http:
paths:
- path: /
Expand All @@ -85,7 +105,7 @@ spec:
name: {{ .Release.Name }}-analytics-service
port:
number: 5051
- host: collector.{{- if .Values.ingressController.host }}
- host: collector.{{ .Values.ingressController.host }}
http:
paths:
- path: /
Expand All @@ -94,6 +114,4 @@ spec:
service:
name: {{ .Release.Name }}-collector-api-service
port:
number: 5049
---
{{ end }}
number: 5049
54 changes: 53 additions & 1 deletion src/digma/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,59 @@ ingressController:
limits:
memory: "500Mi"
cpu: "500m"


tls:
crt: |
-----BEGIN CERTIFICATE-----
MIIDejCCAmKgAwIBAgIUQrcdn18oOcK2Pivkrzi7lmvEoQUwDQYJKoZIhvcNAQEL
BQAwMDEeMBwGA1UEAwwVKi5henVyZS5kaWdtYS5zeXN0ZW1zMQ4wDAYDVQQKDAVE
aWdtYTAeFw0yNDExMjAxNTIzNTlaFw0yNTExMjAxNTIzNTlaMDAxHjAcBgNVBAMM
FSouYXp1cmUuZGlnbWEuc3lzdGVtczEOMAwGA1UECgwFRGlnbWEwggEiMA0GCSqG
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbVOj+VqTxNK2MfxKAKSHsZQRZzh1kiEZC
FXSwkUW/exISiMoZ0wE6cZckMMF/uIYpsN2vsT0/vbsZtxCtzn/vlYyRVzzYVT4U
bHkahWSv35KgpAOcHnshFmmNRIDx8nhzkihlgiEpM4RwcbTB6Zx2VjhZdofgFMQA
ptRO+Yt26m6wM5PoXoyAa8DKQhj9ti9BayTmJyNXBk0hYdwZbeLyozyJ5aaZnfrj
WYfhklv4vtKFNPkUgfxl4f2YW/L5U4jbRdh0wFKSAZWKAjIxSy6Ceb6W+slYgWI0
zRaKbGQc/biFolFW8VYIDKpmuzQi/vzeLwBJJMUIeuXtmh8O4KL5AgMBAAGjgYsw
gYgwHQYDVR0OBBYEFHDT/2vU4vKrpDwKbkFCpCT+6t0ZMB8GA1UdIwQYMBaAFHDT
/2vU4vKrpDwKbkFCpCT+6t0ZMA8GA1UdEwEB/wQFMAMBAf8wNQYDVR0RBC4wLIIV
Ki5henVyZS5kaWdtYS5zeXN0ZW1zghNhenVyZS5kaWdtYS5zeXN0ZW1zMA0GCSqG
SIb3DQEBCwUAA4IBAQCaqiCv5iLITSYvvWM0t2muZPyQDcyVNktXIkQgNASBQ2Hs
szoMd2NdaVeVjNqDupm5/gGbXWCgGKYu1kqt1BkQuxBGLkfLDPSaB3OUu5w1ICwn
QBWhWCQaeCHl41eJSEjPwZpRGQYJz2bibdHaXHCn+QYHzRWCBQAsnpmaY3iv5zVe
m8SnWkrpJ3WGsIj7sR1/xdNPCGvhM+s9L0G4iwokthHddQoZvwZxYJd2LSGQjTLl
kIFzYKoiuVigzurho34CGbLmZvtjh2WsD/I5x+QRSEgG2u1NWBuNNUX6s1wX37F3
MFnm20Snu11dGsvQB3mkHiOlptG8Mods4s1En9Xp
-----END CERTIFICATE-----
key: |
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCbVOj+VqTxNK2M
fxKAKSHsZQRZzh1kiEZCFXSwkUW/exISiMoZ0wE6cZckMMF/uIYpsN2vsT0/vbsZ
txCtzn/vlYyRVzzYVT4UbHkahWSv35KgpAOcHnshFmmNRIDx8nhzkihlgiEpM4Rw
cbTB6Zx2VjhZdofgFMQAptRO+Yt26m6wM5PoXoyAa8DKQhj9ti9BayTmJyNXBk0h
YdwZbeLyozyJ5aaZnfrjWYfhklv4vtKFNPkUgfxl4f2YW/L5U4jbRdh0wFKSAZWK
AjIxSy6Ceb6W+slYgWI0zRaKbGQc/biFolFW8VYIDKpmuzQi/vzeLwBJJMUIeuXt
mh8O4KL5AgMBAAECgf86C9ZbNVsYyEFn6hSqerSH9+KoV1353khjFEwxr21hIPH1
UH410vmiiCWdte/uyrCtjmqe5/JQ35YLsLLgQKA5PVRKUU9riG9VMolkX8pAmaEx
vBjyk8bE6/CF2hOrAUaslEcu/Ry8ni6KgUi12OxJ90PCKt6b3nwLF6I/Nlc9GHPL
GP5WM4hZMR1CtKORTGfX4KN56s6/ZkaKFxSwjuuY+euxjZSQCSsdRjLcapCpcZl2
evNDZqumnyiyN6b1drq+Py+L8m/kqj4+jufDF0wQBwfIrbgce9EayuVz62bgkB5l
C1mPd14/T5KEDmHTRahHDpIgW3rEta1Fju+/YgECgYEAzvJJhs6oomHXCemAMUOj
TaHBe45V8qx+Q3TvRiQhGv36xoW2JJ63GZz2a0qNV9PvdQC45s7tIGFlDBDHs8+i
zz3PQIpiOJdyq/USiLR6ZAsOEr17aPDXhwGP5SnSaswy2mTWJ4ts/2LrgGt1bu2u
32Y+G9n+2B29d8KLY+CIosECgYEAwCaWxlz68nXXRGKTynPGPgLOujx2Vwa+Ywkg
pbYK7QCH2s1mE/TLDl1JTGU072tA1xPhi2BLAHM0TzrAzk0PN7ktpBBeJRwuNoj6
23lB6iq7s32CfYLFs0U7aAYcl721eI4TUFDqN0zKO2ShBqPz11CQ9qzjMF8VcACB
PXv75jkCgYEAkOAdiTpz4/oKyO2myNZJJLfw88aZdOI9IoxiVgBFDNhxDzncYZab
KFsyR7pRaQL9yDNRPoPujZShYOj+ZWse12a2CMDYMjYUGT3gU8PFSvRSTdxI4RZ6
TBFT42J75DhAAZRGODjrfX6Kz8Rq2dWbbtns8SKTvkhTs9uGKc2u2gECgYEAgAg2
Zq4FuBC1Ayf7+eXyrdcJECbBY3Nm4G5whnoqBYlY/H3oClwOAOA/utukzfLVHXpt
yoS69O3OaQxo9A18mlCVDMCrOmbwk/3pyNufA/y9XPfAPwkn2i/DSajo3GLXzCA+
1kFUDszn43NFqDsOeuV/8h14s/5nNl3fv6whSGECgYAWdBGd9bIHhi8RlVrLG09F
3DhqJKUmq+xuRf+oHXPgw1n4l62zzDps2i0HTsjLN5suSw6rAPu/efi9B0KKQisD
eB6gM46MN974uS+ONG25z5Sr7bAknID45NrL8/6Qf/RSrk0h2HJO1sxkFJBlwRQN
MQHyLyyedKJlOKYClu8brA==
-----END PRIVATE KEY-----

grafana:
host: "{{ .Release.Name }}-grafana"
Expand Down
Loading