From: Mike Elliott <mike.elliott@amdocs.com>
Date: Fri, 24 Aug 2018 13:25:42 +0000 (+0000)
Subject: Merge "License Task for VID,AAF,CLI,SNIRO"
X-Git-Tag: 3.0.0-ONAP~437
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b3762ab1f71719b8d9f52063198233bd83ed9a3a;hp=-c;p=oom.git

Merge "License Task for VID,AAF,CLI,SNIRO"
---

b3762ab1f71719b8d9f52063198233bd83ed9a3a
diff --combined kubernetes/vid/charts/vid-galera/templates/statefulset.yaml
index 7d6ce6e676,7bffd2e048..816d473257
--- a/kubernetes/vid/charts/vid-galera/templates/statefulset.yaml
+++ b/kubernetes/vid/charts/vid-galera/templates/statefulset.yaml
@@@ -1,3 -1,17 +1,17 @@@
+ # Copyright © 2018 Amdocs, Bell Canada
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ #       http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
  apiVersion: apps/v1beta1
  kind: StatefulSet
  metadata:
@@@ -16,7 -30,6 +30,7 @@@ spec
      metadata:
        labels:
          app: {{ include "common.fullname" . }}
 +        release: {{ .Release.Name }}
        annotations:
          pod.alpha.kubernetes.io/initialized: "true"
      spec:
diff --combined kubernetes/vid/templates/vid-galera-config-job.yaml
index 0e32261019,70adc6b41c..b893dbf617
--- a/kubernetes/vid/templates/vid-galera-config-job.yaml
+++ b/kubernetes/vid/templates/vid-galera-config-job.yaml
@@@ -1,3 -1,17 +1,17 @@@
+ # Copyright © 2018 Amdocs, Bell Canada
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ #       http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
  apiVersion: batch/v1
  kind: Job
  metadata:
@@@ -9,8 -23,6 +23,8 @@@
  spec:
    template:
      metadata:
 +      labels:
 +        release: {{ .Release.Name }}
        name: vid-galera-init
      spec:
        initContainers: