UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Verified Commit 8fed4c31 authored by David Baker's avatar David Baker :fire:
Browse files

chore(chart): update chart and values for newer image

parent 68d4fd88
No related branches found
No related tags found
1 merge request!61Draft: chore(deps): update ironbank/opensource/haproxy/haproxy24 docker tag to v2.4.28
Pipeline #3965086 failed
......@@ -16,7 +16,7 @@ apiVersion: v2
name: haproxy
description: A Helm chart for HAProxy on Kubernetes
type: application
version: 1.19.3-bb.10
version: 1.19.3-bb.11
appVersion: 2.4.28
kubeVersion: ">=1.17.0-0"
keywords:
......@@ -37,6 +37,6 @@ annotations:
- HAProxy: 2.4.28
helm.sh/images: |
- name: haproxy
image: registry1.dso.mil/ironbank/opensource/haproxy/haproxy22:v2.2.33
image: registry1.dso.mil/ironbank/opensource/haproxy/haproxy24:2.4.28
bigbang.dev/upstreamReleaseNotesMarkdown: |
- [Find upstream chart's release notes and CHANGELOG here](https://www.haproxy.org/download/2.2/src/CHANGELOG)
- [Find upstream chart's release notes and CHANGELOG here](https://www.haproxy.org/download/2.4/src/CHANGELOG)
......@@ -16,7 +16,7 @@ openshift: false
## BigBang additions:
imagePullSecrets:
- name: private-registry
- name: private-registry
usePSP: false
## Default values for HAProxy
......@@ -36,8 +36,8 @@ serviceAccount:
## Default values for image
image:
repository: registry1.dso.mil/ironbank/opensource/haproxy/haproxy22 # can be changed to use CE or EE images
tag: "v2.2.33"
repository: registry1.dso.mil/ironbank/opensource/haproxy/haproxy24 # can be changed to use CE or EE images
tag: "2.4.83"
pullPolicy: IfNotPresent
## Automatically Roll Deployments
......@@ -88,8 +88,8 @@ sidecarContainers: []
## Deployment or DaemonSet pod mode
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
kind: Deployment # can be 'Deployment' or 'DaemonSet'
replicaCount: 1 # used only for Deployment mode
kind: Deployment # can be 'Deployment' or 'DaemonSet'
replicaCount: 1 # used only for Deployment mode
## minReadySeconds setting of Deployment or DaemonSet
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds
......@@ -97,10 +97,10 @@ minReadySeconds: 0
## Command line arguments to pass to HAProxy
args:
enabled: true # EE images require disabling this due to S6-overlay
enabled: true # EE images require disabling this due to S6-overlay
# ref: http://cbonte.github.io/haproxy-dconv/2.6/management.html#3
defaults: ["-f", "/usr/local/etc/haproxy/haproxy.cfg"]
extraArgs: [] # EE images require disabling this due to S6-overlay
extraArgs: [] # EE images require disabling this due to S6-overlay
## Controller Container liveness/readiness probe configuration
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
......@@ -137,7 +137,7 @@ startupProbe:
## DaemonSet configuration
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
daemonset:
useHostNetwork: false # also modify dnsPolicy accordingly
useHostNetwork: false # also modify dnsPolicy accordingly
useHostPort: false
hostPorts:
http: 80
......@@ -163,14 +163,14 @@ terminationGracePeriodSeconds: 60
## Private Registry configuration
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
imageCredentials:
registry: null # EE images require setting this
username: null # EE images require setting this
password: null # EE images require setting this
registry: null # EE images require setting this
username: null # EE images require setting this
password: null # EE images require setting this
existingImagePullSecret: private-registry
## Container listener port configuration
## ref: https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/
containerPorts: # has to match hostPorts when useHostNetwork is true
containerPorts: # has to match hostPorts when useHostNetwork is true
http: 80
https: 443
stat: 1024
......@@ -189,7 +189,8 @@ priorityClassName: ""
## Container lifecycle handlers
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/
lifecycle: {}
lifecycle:
{}
## Example preStop for graceful shutdown
# preStop:
# exec:
......@@ -245,8 +246,8 @@ config: |
# Mount path and sub path for config file
configMount:
mountPath: /usr/local/etc/haproxy/haproxy.cfg # EE images use /etc/hapee-VERSION/hapee-lb.cfg
subPath: haproxy.cfg # EE images use hapee-lb.cfg
mountPath: /usr/local/etc/haproxy/haproxy.cfg # EE images use /etc/hapee-VERSION/hapee-lb.cfg
subPath: haproxy.cfg # EE images use hapee-lb.cfg
## Basic features : Maps
# ref: http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#7.3.1-map
......@@ -266,7 +267,7 @@ includes:
# </body></html>
## Mount path for includes and maps
includesMountPath: /usr/local/etc/haproxy/includes # EE images use /etc/hapee-VERSION
includesMountPath: /usr/local/etc/haproxy/includes # EE images use /etc/hapee-VERSION
## Additional secrets to mount as volumes
## This is expected to be an array of dictionaries specifying the volume name, secret name and mount path
......@@ -330,7 +331,8 @@ rbac:
## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
podSecurityPolicy:
create: false
annotations: {}
annotations:
{}
## Specify pod annotations
## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor
## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
......@@ -350,10 +352,10 @@ podSecurityPolicy:
## Pod Security Context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
podSecurityContext:
podSecurityContext:
enabled: true
capabilities:
drop:
drop:
- ALL
fsGroup: 1111
fsGroupChangePolicy: OnRootMismatch
......@@ -387,7 +389,7 @@ podSecurityContext:
securityContext:
enabled: true
capabilities:
drop:
drop:
- ALL
fsGroup: 1111
fsGroupChangePolicy: OnRootMismatch
......@@ -474,7 +476,7 @@ PodDisruptionBudget:
## Service configuration
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
service:
type: ClusterIP # can be 'LoadBalancer'
type: ClusterIP # can be 'LoadBalancer'
## Service ClusterIP
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
......@@ -502,7 +504,8 @@ service:
## Additional Service ports to use(e.g. port of side container haproxy exporter)
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
additionalPorts: {}
additionalPorts:
{}
# prometheus: 9101
serviceMonitor:
......@@ -536,7 +539,8 @@ ingress:
## Ingress annotations
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
annotations: {}
annotations:
{}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
......@@ -550,7 +554,8 @@ ingress:
## Ingress TLS
## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
tls: []
tls:
[]
# - secretName: chart-example-tls
# hosts:
# - haproxy.domain.com
......@@ -567,4 +572,3 @@ istio:
# STRICT = Allow only mutual TLS traffic
# PERMISSIVE = Allow both plain text and mutual TLS traffic
mode: STRICT
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment