Skip to content

Commit 7a7dc4b

Browse files
committed
Merge remote-tracking branch 'origin/main' into APL-1295
2 parents cc677a4 + 20056aa commit 7a7dc4b

File tree

7 files changed

+3
-41
lines changed

7 files changed

+3
-41
lines changed

src/openapi/app.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ AppList:
1414
- harbor
1515
- ingress-nginx
1616
- istio
17-
- jaeger
1817
- keycloak
1918
- knative
2019
- kserve

src/ttyManifests/adminTtyManifests/tty_02_Pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
runAsGroup: 1001
1717
fsGroup: 1001
1818
containers:
19-
- image: linode/apl-tty:1.2.5
19+
- image: linode/apl-tty:1.2.6
2020
name: po
2121
resources:
2222
requests:

src/ttyManifests/tty_02_Pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
runAsGroup: 1001
1717
fsGroup: 1001
1818
containers:
19-
- image: linode/apl-tty:1.2.5
19+
- image: linode/apl-tty:1.2.6
2020
name: po
2121
resources:
2222
requests:

test/apps.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,6 @@ appsInfo:
106106
about: Istio is an open platform for providing a uniform way to integrate microservices, manage traffic flow across microservices, enforce policies and aggregate telemetry data. Istio's control plane provides an abstraction layer over the underlying cluster management platform.
107107
integration: APL has security best practices built in, and is designed for intrusion. Istio is used by APL as a service mesh to deliver mTLS enforcement for all traffic that is deemed compromisable, egress control to force teams to choose explicit egress endpoints, and advanced routing capabilities such as weight based load balancing (A/B or blue/green testing). Istio is part of the core of APL and can not be disabled.
108108
chartName: istiod
109-
jaeger:
110-
title: Jaeger Operator
111-
dependencies: Open Telemetry (otel)
112-
appVersion: 1.46.0
113-
repo: https://github.com/jaegertracing/jaeger
114-
maintainers: CNCF
115-
relatedLinks:
116-
- https://www.jaegertracing.io/docs/1.37/
117-
license: Apache 2.0
118-
about: Jaeger is a distributed tracing platform. It can be used for monitoring microservices-based distributed systems. As on-the-ground microservice practitioners are quickly realizing, the majority of operational problems that arise when moving to a distributed architecture are ultimately grounded in networking and observability. It is simply an orders of magnitude larger problem to network and debug a set of intertwined distributed services versus a single monolithic application.
119-
integration: Jaeger can be activated to gain tracing insights on its network traffic. It runs in anonymous mode and each authenticated user is given the same authorization, allowing them to see everything.
120-
isDeprecated: true
121-
deprecationInfo:
122-
message: Jaeger distributed tracing is being deprecated.
123-
reasons:
124-
- This tracing tool duplicates functionality provided by Tempo.
125-
options:
126-
- Click 'I understand' to continue using Jaeger dashboard
127109
keycloak:
128110
title: Keycloak
129111
appVersion: 26.3.3
@@ -296,7 +278,7 @@ appsInfo:
296278
- https://opentelemetry.io/docs/collector/
297279
license: AGPL-3.0
298280
dependencies: Prometheus, Grafana, Loki, Tempo
299-
about: The OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data. In addition, it removes the need to run, operate and maintain multiple agents/collectors in order to support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) to multiple open-source or commercial back-ends.
281+
about: The OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data. In addition, it removes the need to run, operate and maintain multiple agents/collectors in order to support open-source telemetry data formats (e.g. Prometheus, etc.) to multiple open-source or commercial back-ends.
300282
integration: OpenTelemetry Collector is used to receive telementry data from Istio Envoy access logs and export this data to Tempo.
301283
chartName: otel-operator
302284
policy-reporter:

test/core.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ k8s:
3636
disableIstioInjection: true
3737
labels:
3838
'apl.io/ingress-controller-scope': 'true'
39-
- name: jaeger
40-
app: jaeger
41-
- name: jaeger-operator
42-
app: jaeger
43-
disableIstioInjection: true
4439
- name: keycloak
4540
- name: apl-keycloak-operator
4641
disableIstioInjection: true
@@ -195,16 +190,6 @@ adminApps:
195190
tags: [ingress, auth]
196191
- name: istio
197192
tags: [ingress, egress, routing, security, tls, observability, policies]
198-
- name: jaeger
199-
tags: [ingress, telemetry, observability]
200-
deps: [istio]
201-
ingress:
202-
- svc: jaeger-operator-jaeger-query
203-
port: 16686
204-
forwardPath: true
205-
namespace: jaeger
206-
type: public
207-
auth: true
208193
- name: keycloak
209194
tags: [auth, sso]
210195
# isShared: true

test/env/apps/jaeger.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/env/teams/apps.admin.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ teamConfig:
1111
harbor: {}
1212
ingress-nginx: {}
1313
istio: {}
14-
jaeger: {}
1514
keycloak: {}
1615
knative: {}
1716
tekton: {}

0 commit comments

Comments
 (0)