Skip to content

Commit da120ef

Browse files
authored
Merge pull request #446 from stefanprodan/helm-remove-linkerd
helm: remove linkerd profile
2 parents 4774237 + ea67271 commit da120ef

File tree

4 files changed

+5
-110
lines changed

4 files changed

+5
-110
lines changed

charts/podinfo/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ The following tables lists the configurable parameters of the podinfo chart and
8686
| `service.nodePort` | `31198` | NodePort for the HTTP endpoint |
8787
| `service.trafficDistribution` | `""` | Traffic distribution strategy |
8888
| `service.additionalLabels` | `{}` | Additional labels to add to the service |
89-
| `externalTrafficPolicy` | `Cluster` | External traffic policy for LoadBalancer and NodePort services |
89+
| `service.externalTrafficPolicy` | `None` | External traffic policy for LoadBalance service |
9090
| `h2c.enabled` | `false` | Allow upgrading to h2c (non-TLS version of HTTP/2) |
9191
| `extraArgs` | `[]` | Additional command line arguments to pass to podinfo container |
9292
| `extraEnvs` | `[]` | Extra environment variables for the podinfo container |
@@ -118,7 +118,6 @@ The following tables lists the configurable parameters of the podinfo chart and
118118
| `httpRoute.parentRefs` | `[]` | Gateways that this route is attached to |
119119
| `httpRoute.hostnames` | `["podinfo.local"]` | Hostnames matching HTTP header |
120120
| `httpRoute.rules` | `[]` | List of rules and filters applied |
121-
| `linkerd.profile.enabled` | `false` | Create Linkerd service profile |
122121
| `resources.requests.cpu` | `1m` | Pod CPU request |
123122
| `resources.requests.memory` | `16Mi` | Pod memory request |
124123
| `resources.limits.cpu` | `None` | Pod CPU limit |

charts/podinfo/templates/linkerd.yaml

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

charts/podinfo/values-prod.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ faults:
2929
service:
3030
enabled: true
3131
annotations: {}
32+
additionalLabels: { }
3233
type: ClusterIP
3334
metricsPort: 9797
3435
httpPort: 9898
3536
externalPort: 9898
3637
grpcPort: 9999
3738
grpcService: podinfo
3839
nodePort: 31198
40+
trafficDistribution: ""
41+
externalTrafficPolicy: ""
3942

4043
# enable h2c protocol (non-TLS version of HTTP/2)
4144
h2c:
@@ -155,10 +158,6 @@ httpRoute:
155158
type: PathPrefix
156159
value: /
157160

158-
linkerd:
159-
profile:
160-
enabled: false
161-
162161
# create Prometheus Operator monitor
163162
serviceMonitor:
164163
enabled: false

charts/podinfo/values.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ faults:
3030
service:
3131
enabled: true
3232
annotations: {}
33+
additionalLabels: { }
3334
type: ClusterIP
3435
metricsPort: 9797
3536
httpPort: 9898
@@ -43,7 +44,6 @@ service:
4344
hostPort:
4445
# Stable from Kubernetes v1.33+ with a value of PreferClose. Additional values are PreferSameZone and PreferSameNode from v1.34+. Empty string means it's disabled.
4546
trafficDistribution: ""
46-
additionalLabels: {}
4747
externalTrafficPolicy: ""
4848

4949
# enable h2c protocol (non-TLS version of HTTP/2)
@@ -173,10 +173,6 @@ httpRoute:
173173
type: PathPrefix
174174
value: /
175175

176-
linkerd:
177-
profile:
178-
enabled: false
179-
180176
# create Prometheus Operator monitor
181177
serviceMonitor:
182178
enabled: false

0 commit comments

Comments
 (0)