summaryrefslogtreecommitdiffstats
path: root/kud/demo/composite-firewall/packetgen
diff options
context:
space:
mode:
authorTodd Malsbary <todd.malsbary@intel.com>2021-07-22 14:12:00 -0700
committerTodd Malsbary <todd.malsbary@intel.com>2021-08-17 10:46:06 -0700
commitf2fe996e63e406973de99fc558b297757d325546 (patch)
treea9b6aedf4ae9f47c329b07752e91ab5f668da6b4 /kud/demo/composite-firewall/packetgen
parent70924000b2d00ec5c692daf425b2f28cbecbc8b1 (diff)
Replace virtlet with kubevirt in plugin_fw_v2
Issue-ID: MULTICLOUD-1324 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: Ifd8ae34b8f04da52acc4c3a6a8259d1bcd05616c
Diffstat (limited to 'kud/demo/composite-firewall/packetgen')
-rw-r--r--kud/demo/composite-firewall/packetgen/templates/deployment.yaml123
-rw-r--r--kud/demo/composite-firewall/packetgen/values.yaml11
2 files changed, 78 insertions, 56 deletions
diff --git a/kud/demo/composite-firewall/packetgen/templates/deployment.yaml b/kud/demo/composite-firewall/packetgen/templates/deployment.yaml
index 827d2838..a46d22ee 100644
--- a/kud/demo/composite-firewall/packetgen/templates/deployment.yaml
+++ b/kud/demo/composite-firewall/packetgen/templates/deployment.yaml
@@ -1,5 +1,5 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: kubevirt.io/v1alpha3
+kind: VirtualMachine
metadata:
name: {{ include "packetgen.fullname" . }}
labels:
@@ -7,11 +7,7 @@ metadata:
app: {{ include "packetgen.name" . }}
chart: {{ .Chart.Name }}
spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app: {{ include "packetgen.name" .}}
- release: {{ .Release.Name }}
+ running: true
template:
metadata:
labels:
@@ -20,46 +16,79 @@ spec:
annotations:
app: {{ include "packetgen.name" . }}
release: {{ .Release.Name }}
- VirtletLibvirtCPUSetting: |
- mode: host-model
- VirtletCloudInitUserData: |
- ssh_pwauth: True
- users:
- - name: admin
- gecos: User
- primary-group: admin
- groups: users
- sudo: ALL=(ALL) NOPASSWD:ALL
- lock_passwd: false
- passwd: "$6$rounds=4096$QA5OCKHTE41$jRACivoPMJcOjLRgxl3t.AMfU7LhCFwOWv2z66CQX.TSxBy50JoYtycJXSPr2JceG.8Tq/82QN9QYt3euYEZW/"
- runcmd:
- - export demo_artifacts_version={{ .Values.global.demoArtifactsVersion }}
- - export vfw_private_ip_0={{ .Values.global.vfwPrivateIp0 }}
- - export vsn_private_ip_0={{ .Values.global.vsnPrivateIp0 }}
- - export protected_net_cidr={{ .Values.global.protectedNetCidr }}
- - export dcae_collector_ip={{ .Values.global.dcaeCollectorIp }}
- - export dcae_collector_port={{ .Values.global.dcaeCollectorPort }}
- - export protected_net_gw={{ .Values.global.protectedNetGw }}
- - export protected_private_net_cidr={{ .Values.global.protectedPrivateNetCidr }}
- - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/packetgen | sudo -E bash
- VirtletRootVolumeSize: 5Gi
- kubernetes.io/target-runtime: virtlet.cloud
spec:
- affinity:
- nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- nodeSelectorTerms:
- - matchExpressions:
- - key: extraRuntime
- operator: In
- values:
- - virtlet
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- tty: true
- stdin: true
+ domain:
+ cpu:
+ model: host-model
+ devices:
+ disks:
+ - name: containerdisk
+ disk:
+ bus: virtio
+ - name: cloudinitdisk
+ disk:
+ bus: virtio
+ interfaces:
+ - name: default
+ bridge: {}
+ - name: unprotected
+ macAddress: ee:f0:75:e0:b6:26
+ bridge: {}
+ - name: emco
+ macAddress: 0a:c0:37:55:f5:ab
+ bridge: {}
resources:
- limits:
+ requests:
memory: {{ .Values.resources.limits.memory }}
+ networks:
+ - name: default
+ pod: {}
+ - name: unprotected
+ multus:
+ networkName: {{ .Values.global.unprotectedNetworkName }}
+ - name: emco
+ multus:
+ networkName: {{ .Values.global.emcoPrivateNetworkName }}
+ volumes:
+ - name: cloudinitdisk
+ cloudInitNoCloud:
+ networkData: |
+ version: 2
+ ethernets:
+ enp1s0:
+ dhcp4: true
+ eth1:
+ match:
+ macaddress: "ee:f0:75:e0:b6:26"
+ set-name: eth1
+ dhcp4: true
+ eth2:
+ match:
+ macaddress: "0a:c0:37:55:f5:ab"
+ set-name: eth2
+ dhcp4: true
+ userData: |
+ #cloud-config
+ ssh_pwauth: True
+ users:
+ - name: admin
+ gecos: User
+ primary-group: admin
+ groups: users
+ sudo: ALL=(ALL) NOPASSWD:ALL
+ lock_passwd: false
+ passwd: "$6$rounds=4096$QA5OCKHTE41$jRACivoPMJcOjLRgxl3t.AMfU7LhCFwOWv2z66CQX.TSxBy50JoYtycJXSPr2JceG.8Tq/82QN9QYt3euYEZW/"
+ runcmd:
+ - export demo_artifacts_version={{ .Values.global.demoArtifactsVersion }}
+ - export vfw_private_ip_0={{ .Values.global.vfwPrivateIp0 }}
+ - export vsn_private_ip_0={{ .Values.global.vsnPrivateIp0 }}
+ - export protected_net_cidr={{ .Values.global.protectedNetCidr }}
+ - export dcae_collector_ip={{ .Values.global.dcaeCollectorIp }}
+ - export dcae_collector_port={{ .Values.global.dcaeCollectorPort }}
+ - export protected_net_gw={{ .Values.global.protectedNetGw }}
+ - export protected_private_net_cidr={{ .Values.global.protectedPrivateNetCidr }}
+ - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/packetgen | sudo -E bash
+ - name: containerdisk
+ containerDisk:
+ image: integratedcloudnative/ubuntu:16.04
+ imagePullPolicy: IfNotPresent
diff --git a/kud/demo/composite-firewall/packetgen/values.yaml b/kud/demo/composite-firewall/packetgen/values.yaml
index f8cac9d5..89bd049b 100644
--- a/kud/demo/composite-firewall/packetgen/values.yaml
+++ b/kud/demo/composite-firewall/packetgen/values.yaml
@@ -2,13 +2,6 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
-replicaCount: 1
-
-image:
- repository: virtlet.cloud/ubuntu/16.04
- tag: latest
- pullPolicy: IfNotPresent
-
nameOverride: ""
fullnameOverride: ""
@@ -43,8 +36,8 @@ global:
vfwPrivateIp2: 10.10.20.3
#Packetgen container
- vpgPrivateIp0: 192.168.10.200
- vpgPrivateIp1: 10.10.20.200
+ vpgPrivateIp0: 192.168.10.2
+ vpgPrivateIp1: 10.10.20.2
#Sink container
vsnPrivateIp0: 192.168.20.3