Merge pull request '[3.2] Backport MetalLB chart fix' (#106) from kzhelyazkov/Factory:backport-metallb-image-fix into 3.2
Reviewed-on: #106 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>
This commit is contained in:
@@ -3,7 +3,8 @@
|
||||
apiVersion: v2
|
||||
appVersion: v0.14.3
|
||||
dependencies:
|
||||
- condition: frrk8s.enabled
|
||||
- alias: metallb-frr-k8s
|
||||
condition: frrk8s.enabled
|
||||
name: frr-k8s
|
||||
repository: file://./charts/frr-k8s
|
||||
version: 0.0.15
|
||||
|
@@ -53,7 +53,7 @@ prometheus:
|
||||
# the image to be used for the kuberbacproxy container
|
||||
rbacProxy:
|
||||
repository: "registry.opensuse.org/isv/suse/edge/metallb/images/kube-rbac-proxy"
|
||||
tag: "v0.18.0"
|
||||
tag: "0.18.1"
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
# Prometheus Operator ServiceMonitors.
|
||||
|
@@ -378,3 +378,15 @@ frrk8s:
|
||||
enabled: false
|
||||
external: false
|
||||
namespace: ""
|
||||
|
||||
# Override any settings for the metallb frr-k8s service here
|
||||
metallb-frr-k8s:
|
||||
prometheus:
|
||||
rbacProxy:
|
||||
repository: "%%IMG_REPO%%/%%IMG_PREFIX%%kube-rbac-proxy"
|
||||
frrk8s:
|
||||
image:
|
||||
repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr-k8s"
|
||||
frr:
|
||||
image:
|
||||
repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr"
|
Reference in New Issue
Block a user