Skip to content

Commit

Permalink
fix runtime chart ingress nginx
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeljguarino committed Sep 19, 2024
1 parent f8af928 commit 2742edb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 37 deletions.
8 changes: 4 additions & 4 deletions charts/runtime/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: external-dns
repository: https://charts.bitnami.com/bitnami
version: 6.38.0
repository: oci://registry-1.docker.io/bitnamicharts
version: 8.3.8
- name: cert-manager
repository: https://charts.jetstack.io
version: v1.13.6
Expand All @@ -17,5 +17,5 @@ dependencies:
- name: flux2
repository: https://fluxcd-community.github.io/helm-charts
version: 2.12.4
digest: sha256:f0973e4808e41fd4bf38cf1c3f3cd16234ff58a9c2de407ba034e0b6cf508144
generated: "2024-09-04T11:07:28.608099-04:00"
digest: sha256:94eba8df7419d9e5cdfe253c29b749dcf67c51207ea25a426e5dc3079fcd54e3
generated: "2024-09-19T00:32:39.59629-04:00"
6 changes: 3 additions & 3 deletions charts/runtime/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apiVersion: v2
name: runtime
description: Sets up the basic dependencies needed to get a network stack running
type: application
version: 0.1.24
version: 0.1.25
appVersion: "0.1.0"
dependencies:
- name: external-dns
version: 6.38.0
repository: https://charts.bitnami.com/bitnami
version: 8.3.8
repository: oci://registry-1.docker.io/bitnamicharts
condition: external-dns.enabled
- name: cert-manager
version: v1.13.6
Expand Down
Binary file removed charts/runtime/charts/external-dns-6.38.0.tgz
Binary file not shown.
Binary file added charts/runtime/charts/external-dns-8.3.8.tgz
Binary file not shown.
30 changes: 0 additions & 30 deletions charts/runtime/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,6 @@ ingress-nginx-private:
proxy-read-timeout: '3600'
proxy-send-timeout: '3600'
log-format-escape-json: "true"
log-format-upstream: '{"msec":"$msec","connection":"$connection","connection_requests":"$connection_requests","pid":"$pid","request_id":"$request_id","request_length":"$request_length","remote_addr":"$remote_addr","remote_user":"$remote_user","remote_port":"$remote_port","time_local":"$time_local","time_iso8601":"$time_iso8601","request":"$request","request_uri":"$request_uri","args":"$args","status":"$status","body_bytes_sent":"$body_bytes_sent","bytes_sent":"$bytes_sent","http_referer":"$http_referer","http_user_agent":"$http_user_agent","http_x_forwarded_for":"$http_x_forwarded_for","http_host":"$http_host","server_name":"$server_name","request_time":"$request_time","upstream":"$upstream_addr","upstream_connect_time":"$upstream_connect_time","upstream_header_time":"$upstream_header_time","upstream_response_time":"$upstream_response_time","upstream_response_length":"$upstream_response_length","upstream_cache_status":"$upstream_cache_status","ssl_protocol":"$ssl_protocol","ssl_cipher":"$ssl_cipher","scheme":"$scheme","request_method":"$request_method","server_protocol":"$server_protocol","pipe":"$pipe","gzip_ratio":"$gzip_ratio","http_cf_ray":"$http_cf_ray","geoip_country_code":"$geoip_country_code"}'
proxySetHeaders:
GeoIP-Country-Code: "$geoip_country_code"
GeoIP-Country-Name: "$geoip_country_name"
GeoIP-Continent-Code: "$geoip_city_continent_code"
GeoIP-Region-Name: "$geoip_region_name"
GeoIP-Region: "$geoip_region"
GeoIP-City: "$geoip_city"
GeoIP-Metro-Code: "$geoip_dma_code"
GeoIP-Area-Code: "$geoip_area_code"
GeoIP-Latitude: "$geoip_latitude"
GeoIP-Longitude: "$geoip_longitude"
GeoIP-Postal-Code: "$geoip_postal_code"
GeoIP-Isp: "$geoip_org"
GeoIP-Organization: "$geoip_org"
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -176,21 +161,6 @@ ingress-nginx:
proxy-read-timeout: '3600'
proxy-send-timeout: '3600'
log-format-escape-json: "true"
log-format-upstream: '{"msec":"$msec","connection":"$connection","connection_requests":"$connection_requests","pid":"$pid","request_id":"$request_id","request_length":"$request_length","remote_addr":"$remote_addr","remote_user":"$remote_user","remote_port":"$remote_port","time_local":"$time_local","time_iso8601":"$time_iso8601","request":"$request","request_uri":"$request_uri","args":"$args","status":"$status","body_bytes_sent":"$body_bytes_sent","bytes_sent":"$bytes_sent","http_referer":"$http_referer","http_user_agent":"$http_user_agent","http_x_forwarded_for":"$http_x_forwarded_for","http_host":"$http_host","server_name":"$server_name","request_time":"$request_time","upstream":"$upstream_addr","upstream_connect_time":"$upstream_connect_time","upstream_header_time":"$upstream_header_time","upstream_response_time":"$upstream_response_time","upstream_response_length":"$upstream_response_length","upstream_cache_status":"$upstream_cache_status","ssl_protocol":"$ssl_protocol","ssl_cipher":"$ssl_cipher","scheme":"$scheme","request_method":"$request_method","server_protocol":"$server_protocol","pipe":"$pipe","gzip_ratio":"$gzip_ratio","http_cf_ray":"$http_cf_ray","geoip_country_code":"$geoip_country_code"}'
proxySetHeaders:
GeoIP-Country-Code: "$geoip_country_code"
GeoIP-Country-Name: "$geoip_country_name"
GeoIP-Continent-Code: "$geoip_city_continent_code"
GeoIP-Region-Name: "$geoip_region_name"
GeoIP-Region: "$geoip_region"
GeoIP-City: "$geoip_city"
GeoIP-Metro-Code: "$geoip_dma_code"
GeoIP-Area-Code: "$geoip_area_code"
GeoIP-Latitude: "$geoip_latitude"
GeoIP-Longitude: "$geoip_longitude"
GeoIP-Postal-Code: "$geoip_postal_code"
GeoIP-Isp: "$geoip_org"
GeoIP-Organization: "$geoip_org"
resources:
requests:
cpu: 100m
Expand Down

0 comments on commit 2742edb

Please sign in to comment.