Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Extract common site naming functions
[icn.git]
/
deploy
/
site
/
pod11
/
site.yaml
diff --git
a/deploy/site/pod11/site.yaml
b/deploy/site/pod11/site.yaml
index
9c66316
..
2563b3c
100644
(file)
--- a/
deploy/site/pod11/site.yaml
+++ b/
deploy/site/pod11/site.yaml
@@
-110,11
+110,7
@@
spec:
provisioning:
macAddress: 00:1e:67:fe:f4:1a
type: ipv4_dhcp
provisioning:
macAddress: 00:1e:67:fe:f4:1a
type: ipv4_dhcp
- private:
- macAddress: 00:1e:67:f8:6a:40
- type: ipv4
- ipAddress: 10.10.112.3/24
- storage:
+ sriov:
macAddress: 00:1e:67:f8:6a:41
type: ipv4
ipAddress: 10.10.113.3/24
macAddress: 00:1e:67:f8:6a:41
type: ipv4
ipAddress: 10.10.113.3/24
@@
-182,11
+178,7
@@
spec:
provisioning:
macAddress: 00:1e:67:f1:5b:91
type: ipv4_dhcp
provisioning:
macAddress: 00:1e:67:f1:5b:91
type: ipv4_dhcp
- private:
- macAddress: 00:1e:67:f8:69:80
- type: ipv4
- ipAddress: 10.10.112.4/24
- storage:
+ sriov:
macAddress: 00:1e:67:f8:69:81
type: ipv4
ipAddress: 10.10.113.4/24
macAddress: 00:1e:67:f8:69:81
type: ipv4
ipAddress: 10.10.113.4/24
@@
-225,7
+217,7
@@
sops:
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
- name: cluster-
e2etest
+ name: cluster-
icn
namespace: metal3
spec:
interval: 5m
namespace: metal3
spec:
interval: 5m
@@
-237,7
+229,7
@@
spec:
name: icn
interval: 1m
values:
name: icn
interval: 1m
values:
- clusterName:
e2etest
+ clusterName:
icn
clusterLabels:
site: pod11
controlPlaneEndpoint: 10.10.110.23
clusterLabels:
site: pod11
controlPlaneEndpoint: 10.10.110.23
@@
-253,7
+245,7
@@
spec:
flux:
url: https://gerrit.akraino.org/r/icn
branch: master
flux:
url: https://gerrit.akraino.org/r/icn
branch: master
- path: ./deploy/site/cluster-
e2etest
+ path: ./deploy/site/cluster-
icn
sops:
kms: []
gcp_kms: []
sops:
kms: []
gcp_kms: []