deploy/addons/plugin_fw_v2.patch

   1 diff --git a/kud/tests/plugin_fw_v2.yaml b/kud/tests/plugin_fw_v2.yaml
   2 index b4dbf77..940ed6d 100644
   3 --- a/kud/tests/plugin_fw_v2.yaml
   4 +++ b/kud/tests/plugin_fw_v2.yaml
   5 @@ -22,7 +22,7 @@ file:
   6  version: emco/v2
   7  resourceContext:
   8    anchor: cluster-providers/{{$.ClusterProvider}}/clusters/{{$cluster.Name}}/labels
   9 -label-name: {{$.ClusterLabel}}
  10 +clusterLabel: {{$.ClusterLabel}}
  11
  12  ---
  13  version: emco/v2
  14 @@ -104,9 +104,9 @@ resourceContext:
  15  metadata:
  16    name: {{$cluster.Name}}
  17  spec:
  18 -  cluster-provider: {{$.ClusterProvider}}
  19 -  cluster-name: {{$cluster.Name}}
  20 -  loadbalancer-ip: "0.0.0.0"
  21 +  clusterProvider: {{$.ClusterProvider}}
  22 +  cluster: {{$cluster.Name}}
  23 +  loadbalancerIp: "0.0.0.0"
  24  {{- end }}
  25
  26  ---
  27 @@ -116,7 +116,7 @@ resourceContext:
  28  metadata:
  29    name: {{.CompositeApp}}
  30  spec:
  31 -  version: {{.Version}}
  32 +  compositeAppVersion: {{.Version}}
  33
  34  ---
  35  version: emco/v2
  36 @@ -159,7 +159,7 @@ resourceContext:
  37  metadata :
  38    name: packetgen-profile
  39  spec:
  40 -  app-name: packetgen
  41 +  app: packetgen
  42  file:
  43    {{.PackagesPath}}/profile.tar.gz
  44
  45 @@ -170,7 +170,7 @@ resourceContext:
  46  metadata :
  47    name: firewall-profile
  48  spec:
  49 -  app-name: firewall
  50 +  app: firewall
  51  file:
  52    {{.PackagesPath}}/profile.tar.gz
  53
  54 @@ -181,7 +181,7 @@ resourceContext:
  55  metadata :
  56    name: sink-profile
  57  spec:
  58 -  app-name: sink
  59 +  app: sink
  60  file:
  61    {{.PackagesPath}}/profile.tar.gz
  62
  63 @@ -192,18 +192,18 @@ resourceContext:
  64  metadata:
  65    name: {{.DeploymentIntentGroup}}
  66  spec:
  67 -  profile: {{.CompositeProfile}}
  68 +  compositeProfile: {{.CompositeProfile}}
  69    version: {{.Release}}
  70 -  logical-cloud: {{.LogicalCloud}}
  71 -  override-values:
  72 -    - app-name: packetgen
  73 +  logicalCloud: {{.LogicalCloud}}
  74 +  overrideValues:
  75 +    - app: packetgen
  76        values:
  77          ".Values.service.ports.nodePort": '30888'
  78 -    - app-name: firewall
  79 +    - app: firewall
  80        values:
  81          ".Values.global.dcaeCollectorIp": 1.2.3.4
  82          ".Values.global.dcaeCollectorPort": '8888'
  83 -    - app-name: sink
  84 +    - app: sink
  85        values:
  86          ".Values.service.ports.nodePort": '30677'
  87
  88 @@ -232,8 +232,8 @@ resourceContext:
  89  metadata:
  90    name: packetgen_workload_intent
  91  spec:
  92 -  application-name: packetgen
  93 -  workload-resource: {{.Release}}-packetgen
  94 +  app: packetgen
  95 +  workloadResource: {{.Release}}-packetgen
  96    type: VirtualMachine
  97
  98  ---
  99 @@ -243,8 +243,8 @@ resourceContext:
 100  metadata:
 101    name: firewall_workload_intent
 102  spec:
 103 -  application-name: firewall
 104 -  workload-resource: {{.Release}}-firewall
 105 +  app: firewall
 106 +  workloadResource: {{.Release}}-firewall
 107    type: VirtualMachine
 108
 109  ---
 110 @@ -254,8 +254,8 @@ resourceContext:
 111  metadata:
 112    name: sink_workload_intent
 113  spec:
 114 -  application-name: sink
 115 -  workload-resource: {{.Release}}-sink
 116 +  app: sink
 117 +  workloadResource: {{.Release}}-sink
 118    type: Deployment
 119
 120  ---
 121 @@ -361,11 +361,11 @@ resourceContext:
 122  metadata:
 123    name: packetgen-placement-intent
 124  spec:
 125 -  app-name: packetgen
 126 +  app: packetgen
 127    intent:
 128      allOf:
 129 -      - provider-name: {{.ClusterProvider}}
 130 -        cluster-label-name: {{.ClusterLabel}}
 131 +      - clusterProvider: {{.ClusterProvider}}
 132 +        clusterLabel: {{.ClusterLabel}}
 133
 134  ---
 135  version: emco/v2
 136 @@ -374,11 +374,11 @@ resourceContext:
 137  metadata:
 138    name: firewall-placement-intent
 139  spec:
 140 -  app-name: firewall
 141 +  app: firewall
 142    intent:
 143      allOf:
 144 -      - provider-name: {{.ClusterProvider}}
 145 -        cluster-label-name: {{.ClusterLabel}}
 146 +      - clusterProvider: {{.ClusterProvider}}
 147 +        clusterLabel: {{.ClusterLabel}}
 148
 149  ---
 150  version: emco/v2
 151 @@ -387,11 +387,11 @@ resourceContext:
 152  metadata:
 153    name: sink-placement-intent
 154  spec:
 155 -  app-name: sink
 156 +  app: sink
 157    intent:
 158      allOf:
 159 -      - provider-name: {{.ClusterProvider}}
 160 -        cluster-label-name: {{.ClusterLabel}}
 161 +      - clusterProvider: {{.ClusterProvider}}
 162 +        clusterLabel: {{.ClusterLabel}}
 163
 164  {{- range $index, $cluster := .Clusters }}
 165  ---