Skip to content

Commit 7bbc2f3

Browse files
davidspekdavidspek
authored
feat(istio): re-onboard + upgrade + split (#843)
* feat(istio): init re-onboard + upgrade + split Signed-off-by: David van der Spek <[email protected]> * fix template Signed-off-by: David van der Spek <[email protected]> * some fixes after pushing Signed-off-by: David van der Spek <[email protected]> * some initial kiali fixes Signed-off-by: David van der Spek <[email protected]> * add default istio gateway to ingress chart Signed-off-by: David van der Spek <[email protected]> * some fixes for aws nlb ingress + kiali vs Signed-off-by: David van der Spek <[email protected]> * fix(kiali): allow for oidc login Signed-off-by: David van der Spek <[email protected]> * fix(kiali): allow it to work with sidecar Signed-off-by: David van der Spek <[email protected]> * fix(kiali): grafana integration Signed-off-by: David van der Spek <[email protected]> * some more kiali templating cleanup Signed-off-by: David van der Spek <[email protected]> * set gateway to 2 replicas + kiali labels Signed-off-by: David van der Spek <[email protected]> * deps and template fixes Signed-off-by: David van der Spek <[email protected]> * fix(kiali): enable support for mimir Signed-off-by: David van der Spek <[email protected]> * enable tracing Signed-off-by: David van der Spek <[email protected]> * update istio dashboards Signed-off-by: David van der Spek <[email protected]> * bump chart versions Signed-off-by: David van der Spek <[email protected]> * remove breaking flag Signed-off-by: David van der Spek <[email protected]> * fix recipes Signed-off-by: David van der Spek <[email protected]> --------- Signed-off-by: David van der Spek <[email protected]>
1 parent ed6b13d commit 7bbc2f3

File tree

114 files changed

+4568
-1767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+4568
-1767
lines changed

‎bootstrap/helm/bootstrap/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
email: [email protected]
1111
- name: David van der Spek
1212
email: [email protected]
13-
version: 0.8.73
13+
version: 0.8.74
1414
dependencies:
1515
- name: external-dns
1616
version: 6.14.1

‎bootstrap/helm/bootstrap/values.yaml.tpl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ external-dns:
5252
sources:
5353
- service
5454
- ingress
55-
{{ if .Configuration.istio }}
56-
- istio-gateway
55+
{{- if chartInstalled "istio" "istio" }}
5756
- istio-virtualservice
58-
{{ end }}
57+
{{- end }}
5958

6059
{{ if and (not $pluraldns) (eq .Provider "azure") }}
6160
externalDnsIdentityId: {{ importValue "Terraform" "externaldns_msi_id" }}

‎grafana-agent/helm/grafana-agent/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: grafana-agent
33
description: helm chart for grafana-agent
44
type: application
5-
version: 0.1.3
5+
version: 0.1.4
66
appVersion: v0.34.3
77
dependencies:
88
- name: grafana-agent

‎grafana-agent/helm/grafana-agent/values.yaml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ traces: # TODO: split this into 2 deployment to allow for tail based sampling. F
200200
port: 6831
201201
targetPort: 6831
202202
protocol: "UDP"
203+
- name: http-zipkin
204+
port: 9411
205+
targetPort: 9411
206+
protocol: "TCP"
203207
mimirHost: http://mimir-nginx.mimir
204208
lokiHost: http://loki-loki-distributed-gateway.loki/loki/api/v1/push
205209
tempoHost: http://tempo-gateway.tempo/otlp
@@ -260,9 +264,16 @@ traces: # TODO: split this into 2 deployment to allow for tail based sampling. F
260264
}
261265
262266
output {
263-
metrics = [otelcol.exporter.otlphttp.local.input]
264-
logs = [otelcol.exporter.otlphttp.local.input]
265-
traces = [otelcol.exporter.otlphttp.local.input]
267+
metrics = [otelcol.processor.batch.local.input]
268+
logs = [otelcol.processor.batch.local.input]
269+
traces = [otelcol.processor.batch.local.input]
270+
}
271+
}
272+
273+
otelcol.receiver.zipkin "local" {
274+
endpoint = "0.0.0.0:9411"
275+
output {
276+
traces = [otelcol.processor.batch.local.input]
266277
}
267278
}
268279

‎istio-cni/Pluralfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
REPO istio-cni
2+
ATTRIBUTES Plural repository.yaml
3+
4+
TF terraform/*
5+
HELM helm/*
6+
RECIPE plural/recipes/*

‎istio-cni/helm/istio-cni/.helmignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
# Common VCS dirs
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
# Common backup files
14+
*.swp
15+
*.bak
16+
*.tmp
17+
*.orig
18+
*~
19+
# Various IDEs
20+
.project
21+
.idea/
22+
*.tmproj
23+
.vscode/

‎istio-cni/helm/istio-cni/Chart.lock‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
dependencies:
2+
- name: cni
3+
repository: https://istio-release.storage.googleapis.com/charts
4+
version: 1.19.0
5+
- name: ztunnel
6+
repository: https://istio-release.storage.googleapis.com/charts
7+
version: 1.19.0
8+
digest: sha256:5f9e835cde6c2cda3a01add30d38cee44a3c2595306f17914015c3ee3ed6e0d8
9+
generated: "2023-09-11T12:24:33.670239+02:00"

‎istio-cni/helm/istio-cni/Chart.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: v2
2+
name: istio-cni
3+
description: helm chart for istio-cni
4+
type: application
5+
version: 0.1.1
6+
appVersion: "1.19.0"
7+
dependencies:
8+
- name: cni
9+
version: 1.19.0
10+
repository: https://istio-release.storage.googleapis.com/charts
11+
condition: cni.enabled
12+
- name: ztunnel
13+
version: 1.19.0
14+
repository: https://istio-release.storage.googleapis.com/charts
15+
condition: ztunnel.enabled

‎istio-cni/helm/istio-cni/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
A helm chart for istio-cni

‎istio-cni/helm/istio-cni/charts/cni-1.19.0.tgz‎

5.82 KB
Binary file not shown.

0 commit comments

Comments
 (0)