remove makefiles

edgelesssys · Aug 18, 2023 · 335f6dc · 335f6dc
1 parent b81cfe3
commit 335f6dc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 53 deletions.
diff --git a/.github/actions/deploy_logcollection/action.yml b/.github/actions/deploy_logcollection/action.yml
@@ -55,8 +55,10 @@ runs:
       env:
         KUBECONFIG: ${{ inputs.kubeconfig }}
       run: |
-        make add
-        make install
+        helm repo add elastic https://helm.elastic.co
+	      helm repo update
+        helm install logstash elastic/logstash \
+	        --wait --timeout=1200s --values values.yml
 
     - name: Deploy Filebeat
       id: deploy-filebeat
@@ -65,5 +67,7 @@ runs:
       env:
         KUBECONFIG: ${{ inputs.kubeconfig }}
       run: |
-        make add
-        make install
+        elm repo add elastic https://helm.elastic.co
+	      helm repo update
+        helm install filebeat elastic/filebeat \
+	        --wait --timeout=1200s --values values.yml
diff --git a/hack/go.mod b/hack/go.mod
@@ -51,7 +51,6 @@ require (
 	go.uber.org/zap v1.24.0
 	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
 	golang.org/x/mod v0.12.0
-	gopkg.in/square/go-jose.v2 v2.6.0
 	gopkg.in/yaml.v3 v3.0.1
 	libvirt.org/go/libvirt v1.9004.0
 )

diff --git a/hack/logcollector/internal/BUILD.bazel b/hack/logcollector/internal/BUILD.bazel
@@ -8,9 +8,7 @@ go_library(
         "prepare.go",
     ],
     embedsrcs = [
-        "templates/filebeat/Makefile",
         "templates/filebeat/values.yml",
-        "templates/logstash/Makefile",
         "templates/logstash/values.yml",
     ],
     importpath = "github.com/edgelesssys/constellation/v2/hack/logcollector/internal",

diff --git a/hack/logcollector/internal/filebeat.go b/hack/logcollector/internal/filebeat.go
@@ -57,11 +57,6 @@ func (p *FilebeatPreparer) Prepare(dir string) error {
 		return fmt.Errorf("read values.yml: %w", err)
 	}
 
-	makefile, err := filebeatHelmAssets.ReadFile("templates/filebeat/Makefile")
-	if err != nil {
-		return fmt.Errorf("read makefile: %w", err)
-	}
-
 	helmValuesYaml := &FilebeatHelmValues{}
 	if err := yaml.Unmarshal(rawHelmValues, helmValuesYaml); err != nil {
 		return fmt.Errorf("unmarshal values.yml: %w", err)
@@ -79,10 +74,6 @@ func (p *FilebeatPreparer) Prepare(dir string) error {
 		return fmt.Errorf("write values.yml: %w", err)
 	}
 
-	if err = p.fh.Write(filepath.Join(dir, "filebeat", "Makefile"), makefile, file.OptMkdirAll); err != nil {
-		return fmt.Errorf("write makefile: %w", err)
-	}
-
 	return nil
 }
 

diff --git a/hack/logcollector/internal/logstash.go b/hack/logcollector/internal/logstash.go
@@ -86,11 +86,6 @@ func (p *LogstashPreparer) Prepare(dir string) error {
 		return fmt.Errorf("unmarshal values.yml: %w", err)
 	}
 
-	makefile, err := logstashHelmAssets.ReadFile("templates/logstash/Makefile")
-	if err != nil {
-		return fmt.Errorf("read makefile: %w", err)
-	}
-
 	helmValuesYaml.LogstashConfig.LogstashYml = helmValuesYaml.LogstashConfig.LogstashYml + string(logstashYaml)
 	helmValuesYaml.LogstashConfig.Log4J2Properties = string(log4jProperties)
 	helmValuesYaml.LogstashPipeline.LogstashConf = templatedPipelineConf.String()
@@ -106,10 +101,6 @@ func (p *LogstashPreparer) Prepare(dir string) error {
 		return fmt.Errorf("write values.yml: %w", err)
 	}
 
-	if err = p.fh.Write(filepath.Join(dir, "logstash", "Makefile"), makefile, file.OptMkdirAll); err != nil {
-		return fmt.Errorf("write makefile: %w", err)
-	}
-
 	return nil
 }
 

diff --git a/hack/logcollector/internal/templates/filebeat/Makefile b/hack/logcollector/internal/templates/filebeat/Makefile
diff --git a/hack/logcollector/internal/templates/logstash/Makefile b/hack/logcollector/internal/templates/logstash/Makefile