From c700639e5a29b1907976519918969b752d5be1e7 Mon Sep 17 00:00:00 2001
From: James Gu <james.gu@att.com>
Date: Wed, 30 Sep 2020 16:06:14 -0700
Subject: Upgrade intel pod 15 to Airship 1.8

Depends: https://gerrit.opnfv.org/gerrit/c/airship/+/70158
Change-Id: Ic9b8a56de430d02f2f21e053a40c9c29ab40433f
Signed-off-by: James Gu <james.gu@att.com>
---
 .../software/charts/osh-infra/fluentbit.yaml       | 22 --------------
 .../software/charts/osh-infra/fluentd.yaml         | 22 --------------
 .../software/charts/osh-infra/grafana.yaml         | 23 --------------
 .../software/charts/osh-infra/ingress.yaml         | 24 ---------------
 .../software/charts/osh-infra/mariadb.yaml         | 24 ---------------
 .../software/charts/osh-infra/prometheus.yaml      | 35 ----------------------
 6 files changed, 150 deletions(-)
 delete mode 100644 site/intel-pod15/software/charts/osh-infra/fluentbit.yaml
 delete mode 100644 site/intel-pod15/software/charts/osh-infra/fluentd.yaml
 delete mode 100644 site/intel-pod15/software/charts/osh-infra/grafana.yaml
 delete mode 100644 site/intel-pod15/software/charts/osh-infra/ingress.yaml
 delete mode 100644 site/intel-pod15/software/charts/osh-infra/mariadb.yaml
 delete mode 100644 site/intel-pod15/software/charts/osh-infra/prometheus.yaml

(limited to 'site/intel-pod15/software/charts/osh-infra')

diff --git a/site/intel-pod15/software/charts/osh-infra/fluentbit.yaml b/site/intel-pod15/software/charts/osh-infra/fluentbit.yaml
deleted file mode 100644
index 5d2f287..0000000
--- a/site/intel-pod15/software/charts/osh-infra/fluentbit.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: fluentbit
-  labels:
-    name: fluentbit-type
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      hosttype: fluentbit-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        fluentd: 1
-...
diff --git a/site/intel-pod15/software/charts/osh-infra/fluentd.yaml b/site/intel-pod15/software/charts/osh-infra/fluentd.yaml
deleted file mode 100644
index 3652a3e..0000000
--- a/site/intel-pod15/software/charts/osh-infra/fluentd.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: fluentd
-  labels:
-    name: fluentd-type
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      hosttype: fluentd-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        fluentd: 1
-...
diff --git a/site/intel-pod15/software/charts/osh-infra/grafana.yaml b/site/intel-pod15/software/charts/osh-infra/grafana.yaml
deleted file mode 100644
index b35614f..0000000
--- a/site/intel-pod15/software/charts/osh-infra/grafana.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: grafana
-  labels:
-    name: grafana-type
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: grafana-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        grafana: 1
-...
diff --git a/site/intel-pod15/software/charts/osh-infra/ingress.yaml b/site/intel-pod15/software/charts/osh-infra/ingress.yaml
deleted file mode 100644
index d449881..0000000
--- a/site/intel-pod15/software/charts/osh-infra/ingress.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: osh-infra-ingress-controller
-  labels:
-    name: osh-infra-ingress-controller-type
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: osh-infra-ingress-controller-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        ingress: 1
-        error_page: 1
-...
diff --git a/site/intel-pod15/software/charts/osh-infra/mariadb.yaml b/site/intel-pod15/software/charts/osh-infra/mariadb.yaml
deleted file mode 100644
index 335d4e9..0000000
--- a/site/intel-pod15/software/charts/osh-infra/mariadb.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: osh-infra-mariadb
-  labels:
-    name: osh-infra-mariadb-type
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: osh-infra-mariadb-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        server: 1
-        ingress: 1
-...
diff --git a/site/intel-pod15/software/charts/osh-infra/prometheus.yaml b/site/intel-pod15/software/charts/osh-infra/prometheus.yaml
deleted file mode 100644
index d00e96a..0000000
--- a/site/intel-pod15/software/charts/osh-infra/prometheus.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: prometheus
-  labels:
-    name: prometheus-type
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: prometheus-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        prometheus: 1
-      resources:
-        enabled: true
-        prometheus:
-          limits:
-            memory: "4Gi"
-            cpu: "2000m"
-          requests:
-            memory: "2Gi"
-            cpu: "1000m"
-    storage:
-      requests:
-        storage: 20Gi
-...
-- 
cgit 1.2.3-korg