diff options
Diffstat (limited to 'vagrant/tests/_common.sh')
| -rwxr-xr-x | vagrant/tests/_common.sh | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/vagrant/tests/_common.sh b/vagrant/tests/_common.sh index 21aad4d2..e5f269dc 100755 --- a/vagrant/tests/_common.sh +++ b/vagrant/tests/_common.sh @@ -43,8 +43,8 @@ resources: META cat << NET > unprotected-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: unprotected-private-net-cidr spec: @@ -59,8 +59,8 @@ spec: NET cat << NET > protected-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: protected-private-net-cidr spec: @@ -75,8 +75,8 @@ spec: NET cat << NET > onap-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: onap-private-net-cidr spec: @@ -107,7 +107,7 @@ spec: labels: app: vFirewall annotations: - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth2" } ]' @@ -140,7 +140,7 @@ spec: labels: app: vFirewall annotations: - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "protected-private-net-cidr", "interfaceRequest": "eth2" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth3" } @@ -171,7 +171,7 @@ spec: labels: app: vFirewall annotations: - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "protected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth2" } ]' @@ -244,8 +244,8 @@ spec: INGRESS cat << NET > unprotected-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: unprotected-private-net-cidr spec: @@ -260,8 +260,8 @@ spec: NET cat << NET > protected-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: protected-private-net-cidr spec: @@ -276,8 +276,8 @@ spec: NET cat << NET > onap-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: onap-private-net-cidr spec: @@ -349,7 +349,7 @@ spec: VirtletSSHKeys: | $ssh_key VirtletRootVolumeSize: 5Gi - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth2" } ]' @@ -416,7 +416,7 @@ spec: VirtletSSHKeys: | $ssh_key VirtletRootVolumeSize: 5Gi - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "protected-private-net-cidr", "interfaceRequest": "eth2" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth3" } @@ -460,7 +460,7 @@ spec: labels: app: vFirewall annotations: - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "protected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth2" } ]' @@ -506,8 +506,8 @@ resources: META cat << NET > unprotected-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: unprotected-private-net-cidr spec: @@ -522,8 +522,8 @@ spec: NET cat << NET > protected-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: protected-private-net-cidr spec: @@ -538,8 +538,8 @@ spec: NET cat << NET > onap-private-net-cidr-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: onap-private-net-cidr spec: @@ -611,7 +611,7 @@ spec: VirtletSSHKeys: | $ssh_key VirtletRootVolumeSize: 5Gi - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth2" } ]' @@ -678,7 +678,7 @@ spec: VirtletSSHKeys: | $ssh_key VirtletRootVolumeSize: 5Gi - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "protected-private-net-cidr", "interfaceRequest": "eth2" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth3" } @@ -744,7 +744,7 @@ spec: VirtletSSHKeys: | $ssh_key VirtletRootVolumeSize: 5Gi - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "protected-private-net-cidr", "interfaceRequest": "eth1" }, { "name": "onap-private-net-cidr", "interfaceRequest": "eth2" } ]' @@ -791,12 +791,13 @@ resources: META cat << NET > bridge-network.yaml -apiVersion: "kubernetes.cni.cncf.io/v1" -kind: Network +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition metadata: name: bridge-conf spec: config: '{ + "cniVersion": "0.3.0", "name": "mynet", "type": "bridge", "ipam": { @@ -823,7 +824,7 @@ spec: labels: app: multus annotations: - kubernetes.v1.cni.cncf.io/networks: '[ + k8s.v1.cni.cncf.io/networks: '[ { "name": "bridge-conf", "interfaceRequest": "eth1" }, { "name": "bridge-conf", "interfaceRequest": "eth2" } ]' |