Merge branch 'metallb-update' into 'master'
Update metallb version See merge request domaindrivenarchitecture/provs!3
This commit is contained in:
commit
305b93f2f8
7 changed files with 4008 additions and 43 deletions
|
@ -90,13 +90,17 @@ fun Prov.installK3s(k3sConfig: K3sConfig): ProvResult {
|
|||
cmd("INSTALL_K3S_VERSION=$K3S_VERSION k3s-install.sh")
|
||||
|
||||
// metallb
|
||||
applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-namespace.yaml"))
|
||||
applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-0.10.2-manifest.yaml"))
|
||||
applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-0.13.7-native-manifest.yaml"))
|
||||
|
||||
repeatTaskUntilSuccess(6, 10) {
|
||||
applyK3sFileFromResourceTemplate(
|
||||
File(k3sManualManifestsDir, "metallb-config.yaml"),
|
||||
k3sConfigMap,
|
||||
alternativeResourceName = File(metallbConfigResourceFileName)
|
||||
)
|
||||
}
|
||||
|
||||
applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-l2advertisement.yaml"))
|
||||
|
||||
// traefik
|
||||
if (k3sConfig.isDualStack()) {
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,18 +1,19 @@
|
|||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
apiVersion: metallb.io/v1beta1
|
||||
kind: IPAddressPool
|
||||
metadata:
|
||||
name: public
|
||||
namespace: metallb-system
|
||||
name: config
|
||||
data:
|
||||
config: |
|
||||
address-pools:
|
||||
- name: public
|
||||
protocol: layer2
|
||||
spec:
|
||||
addresses:
|
||||
- ${node_ipv4}/32
|
||||
- ${node_ipv6}/128
|
||||
- name: private
|
||||
protocol: layer2
|
||||
---
|
||||
apiVersion: metallb.io/v1beta1
|
||||
kind: IPAddressPool
|
||||
metadata:
|
||||
name: private
|
||||
namespace: metallb-system
|
||||
spec:
|
||||
addresses:
|
||||
- ${loopback_ipv4}/32
|
||||
- ${loopback_ipv6}/128
|
|
@ -1,16 +1,17 @@
|
|||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
apiVersion: metallb.io/v1beta1
|
||||
kind: IPAddressPool
|
||||
metadata:
|
||||
name: public
|
||||
namespace: metallb-system
|
||||
name: config
|
||||
data:
|
||||
config: |
|
||||
address-pools:
|
||||
- name: public
|
||||
protocol: layer2
|
||||
spec:
|
||||
addresses:
|
||||
- ${node_ipv4}/32
|
||||
- name: private
|
||||
protocol: layer2
|
||||
---
|
||||
apiVersion: metallb.io/v1beta1
|
||||
kind: IPAddressPool
|
||||
metadata:
|
||||
name: private
|
||||
namespace: metallb-system
|
||||
spec:
|
||||
addresses:
|
||||
- ${loopback_ipv4}/32
|
|
@ -0,0 +1,9 @@
|
|||
apiVersion: metallb.io/v1beta1
|
||||
kind: L2Advertisement
|
||||
metadata:
|
||||
name: layer2
|
||||
namespace: metallb-system
|
||||
spec:
|
||||
ipAddressPools:
|
||||
- private
|
||||
- public
|
|
@ -1,6 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: metallb-system
|
||||
labels:
|
||||
app: metallb
|
Loading…
Reference in a new issue