diff --git a/charts/podinfo/README.md b/charts/podinfo/README.md index f4c7891..5594cee 100644 --- a/charts/podinfo/README.md +++ b/charts/podinfo/README.md @@ -86,7 +86,7 @@ The following tables lists the configurable parameters of the podinfo chart and | `service.nodePort` | `31198` | NodePort for the HTTP endpoint | | `service.trafficDistribution` | `""` | Traffic distribution strategy | | `service.additionalLabels` | `{}` | Additional labels to add to the service | -| `externalTrafficPolicy` | `Cluster` | External traffic policy for LoadBalancer and NodePort services | +| `service.externalTrafficPolicy` | `None` | External traffic policy for LoadBalance service | | `h2c.enabled` | `false` | Allow upgrading to h2c (non-TLS version of HTTP/2) | | `extraArgs` | `[]` | Additional command line arguments to pass to podinfo container | | `extraEnvs` | `[]` | Extra environment variables for the podinfo container | @@ -118,7 +118,6 @@ The following tables lists the configurable parameters of the podinfo chart and | `httpRoute.parentRefs` | `[]` | Gateways that this route is attached to | | `httpRoute.hostnames` | `["podinfo.local"]` | Hostnames matching HTTP header | | `httpRoute.rules` | `[]` | List of rules and filters applied | -| `linkerd.profile.enabled` | `false` | Create Linkerd service profile | | `resources.requests.cpu` | `1m` | Pod CPU request | | `resources.requests.memory` | `16Mi` | Pod memory request | | `resources.limits.cpu` | `None` | Pod CPU limit | diff --git a/charts/podinfo/templates/linkerd.yaml b/charts/podinfo/templates/linkerd.yaml deleted file mode 100644 index 15ae969..0000000 --- a/charts/podinfo/templates/linkerd.yaml +++ /dev/null @@ -1,99 +0,0 @@ -{{- if .Values.linkerd.profile.enabled -}} -apiVersion: linkerd.io/v1alpha2 -kind: ServiceProfile -metadata: - name: {{ template "podinfo.fullname" . }}.{{ include "podinfo.namespace" . }}.svc.cluster.local - namespace: {{ include "podinfo.namespace" . }} - labels: - {{- include "podinfo.labels" . | nindent 4 }} -spec: - routes: - - condition: - method: GET - pathRegex: / - name: GET / - - condition: - method: POST - pathRegex: /api/echo - name: POST /api/echo - - condition: - method: GET - pathRegex: /api/info - name: GET /api/info - - condition: - method: GET - pathRegex: /chunked/[^/]* - name: GET /chunked/{seconds} - - condition: - method: GET - pathRegex: /delay/[^/]* - name: GET /delay/{seconds} - - condition: - method: GET - pathRegex: /env - name: GET /env - - condition: - method: GET - pathRegex: /headers - name: GET /headers - - condition: - method: GET - pathRegex: /healthz - name: GET /healthz - - condition: - method: GET - pathRegex: /metrics - name: GET /metrics - - condition: - method: GET - pathRegex: /panic - name: GET /panic - - condition: - method: GET - pathRegex: /readyz - name: GET /readyz - - condition: - method: POST - pathRegex: /readyz/disable - name: POST /readyz/disable - - condition: - method: POST - pathRegex: /readyz/enable - name: POST /readyz/enable - - condition: - method: GET - pathRegex: /status/[^/]* - name: GET /status/{code} - - condition: - method: POST - pathRegex: /cache - name: POST /cache - - condition: - method: GET - pathRegex: /cache/[^/]* - name: GET /cache/{hash} - - condition: - method: POST - pathRegex: /store - name: POST /store - - condition: - method: GET - pathRegex: /store/[^/]* - name: GET /store/{hash} - - condition: - method: POST - pathRegex: /token - name: POST /token - - condition: - method: POST - pathRegex: /token/validate - name: POST /token/validate - - condition: - method: GET - pathRegex: /version - name: GET /version - - condition: - method: POST - pathRegex: /ws/echo - name: POST /ws/echo -{{- end }} \ No newline at end of file diff --git a/charts/podinfo/values-prod.yaml b/charts/podinfo/values-prod.yaml index 03ab622..15cac5f 100644 --- a/charts/podinfo/values-prod.yaml +++ b/charts/podinfo/values-prod.yaml @@ -29,6 +29,7 @@ faults: service: enabled: true annotations: {} + additionalLabels: { } type: ClusterIP metricsPort: 9797 httpPort: 9898 @@ -36,6 +37,8 @@ service: grpcPort: 9999 grpcService: podinfo nodePort: 31198 + trafficDistribution: "" + externalTrafficPolicy: "" # enable h2c protocol (non-TLS version of HTTP/2) h2c: @@ -155,10 +158,6 @@ httpRoute: type: PathPrefix value: / -linkerd: - profile: - enabled: false - # create Prometheus Operator monitor serviceMonitor: enabled: false diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml index 3b79801..03ab5f3 100644 --- a/charts/podinfo/values.yaml +++ b/charts/podinfo/values.yaml @@ -30,6 +30,7 @@ faults: service: enabled: true annotations: {} + additionalLabels: { } type: ClusterIP metricsPort: 9797 httpPort: 9898 @@ -43,7 +44,6 @@ service: hostPort: # 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. trafficDistribution: "" - additionalLabels: {} externalTrafficPolicy: "" # enable h2c protocol (non-TLS version of HTTP/2) @@ -173,10 +173,6 @@ httpRoute: type: PathPrefix value: / -linkerd: - profile: - enabled: false - # create Prometheus Operator monitor serviceMonitor: enabled: false