From da4f1540dec64779c01f7d0258b1a748ace9b131 Mon Sep 17 00:00:00 2001
From: James Gu <james.gu@att.com>
Date: Mon, 4 May 2020 13:57:29 -0700
Subject: Treasuremap 1.8 integration

Upgrade pod 17 to Treasuremap 1.8 prime for CNTT RI-1.

Added deploy script enhancement to include pregenesis, certs, and wrapper
for shipyard cli command.

Added clean-genesis script to properly clean genesis node for redeployment.

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: I4c150ef216d5eb631a0980c72b3c6c80a55788d0
Signed-off-by: James Gu <james.gu@att.com>
---
 .../software/charts/osh-infra/fluentbit.yaml       | 18 ------------
 .../software/charts/osh-infra/fluentd.yaml         | 18 ------------
 .../software/charts/osh-infra/prometheus.yaml      | 33 ----------------------
 3 files changed, 69 deletions(-)
 delete mode 100644 site/intel-pod17/software/charts/osh-infra/fluentbit.yaml
 delete mode 100644 site/intel-pod17/software/charts/osh-infra/fluentd.yaml
 delete mode 100644 site/intel-pod17/software/charts/osh-infra/prometheus.yaml

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

diff --git a/site/intel-pod17/software/charts/osh-infra/fluentbit.yaml b/site/intel-pod17/software/charts/osh-infra/fluentbit.yaml
deleted file mode 100644
index 1620f26..0000000
--- a/site/intel-pod17/software/charts/osh-infra/fluentbit.yaml
+++ /dev/null
@@ -1,18 +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: {}
-...
diff --git a/site/intel-pod17/software/charts/osh-infra/fluentd.yaml b/site/intel-pod17/software/charts/osh-infra/fluentd.yaml
deleted file mode 100644
index 0032414..0000000
--- a/site/intel-pod17/software/charts/osh-infra/fluentd.yaml
+++ /dev/null
@@ -1,18 +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: {}
-...
diff --git a/site/intel-pod17/software/charts/osh-infra/prometheus.yaml b/site/intel-pod17/software/charts/osh-infra/prometheus.yaml
deleted file mode 100644
index c4cd4bf..0000000
--- a/site/intel-pod17/software/charts/osh-infra/prometheus.yaml
+++ /dev/null
@@ -1,33 +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:
-      resources:
-        enabled: true
-        prometheus:
-          limits:
-            memory: "4Gi"
-            cpu: "2000m"
-          requests:
-            memory: "2Gi"
-            cpu: "1000m"
-    storage:
-      requests:
-        storage: 10Gi
-...
-- 
cgit 1.2.3-korg