From 3355487d012a9a5ee1b5b31e89d903818471bcf7 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 24 Jul 2024 09:25:01 +0000
Subject: [PATCH] Pre-merge cleanup

---
 deploy/exporters.sh                     | 23 -----------------------
 manifests/kafka/01-zookeeper.yaml       | 15 +++++++++++++++
 manifests/kafka/02-kafka.yaml           | 15 +++++++++++++++
 manifests/node_exporter_deployment.yaml | 21 ---------------------
 manifests/node_exporter_service.yaml    | 12 ------------
 5 files changed, 30 insertions(+), 56 deletions(-)
 delete mode 100644 deploy/exporters.sh
 delete mode 100644 manifests/node_exporter_deployment.yaml
 delete mode 100644 manifests/node_exporter_service.yaml

diff --git a/deploy/exporters.sh b/deploy/exporters.sh
deleted file mode 100644
index 6c56f25c9..000000000
--- a/deploy/exporters.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
-#
-# 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.
-
-########################################################################################################################
-# Read deployment settings
-########################################################################################################################
-
-# If not already set, set the namespace where Apache Kafka will be deployed.
-export KFK_NAMESPACE=${KFK_NAMESPACE:-"exporters"}
-
-# Add instruction of exporter automatic deployment here
\ No newline at end of file
diff --git a/manifests/kafka/01-zookeeper.yaml b/manifests/kafka/01-zookeeper.yaml
index 0f5ade5d9..c0e87ae0c 100644
--- a/manifests/kafka/01-zookeeper.yaml
+++ b/manifests/kafka/01-zookeeper.yaml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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: v1
 kind: Service
 metadata:
diff --git a/manifests/kafka/02-kafka.yaml b/manifests/kafka/02-kafka.yaml
index 8a2b51724..8e4562e6e 100644
--- a/manifests/kafka/02-kafka.yaml
+++ b/manifests/kafka/02-kafka.yaml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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: v1
 kind: Service
 metadata:
diff --git a/manifests/node_exporter_deployment.yaml b/manifests/node_exporter_deployment.yaml
deleted file mode 100644
index bf595d63a..000000000
--- a/manifests/node_exporter_deployment.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: node-exporter
-  labels:
-    app: node-exporter
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: node-exporter
-  template:
-    metadata:
-      labels:
-        app: node-exporter
-    spec:
-      containers:
-      - name: node-exporter
-        image: prom/node-exporter:latest
-        ports:
-        - containerPort: 9100
diff --git a/manifests/node_exporter_service.yaml b/manifests/node_exporter_service.yaml
deleted file mode 100644
index b7bb4f879..000000000
--- a/manifests/node_exporter_service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: node-exporter
-spec:
-  selector:
-    app: node-exporter
-  ports:
-    - protocol: TCP
-      port: 9100
-      targetPort: 9100
-  type: NodePort
-- 
GitLab