Rebase with updated structure

deploy/inputrunner-kubernetes-manifest.yml

@@ -47,8 +47,8 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
          - name: inputrunner
-           image: inputrunner:latest
-           imagePullPolicy: Never
+           image: michaelkatsoulis/inputrunner:latest 
+         #   imagePullPolicy: Never
          #   command: ['sleep 3600']
            env:
                   # The basic authentication username used to connect to Elasticsearch
@@ -57,13 +57,13 @@ spec:
                     value: "elastic"
                   # The basic authentication password used to connect to Elasticsearch
                   - name: ELASTICSEARCH_PASSWORD
-                    value: "changeme"
+                    value: "OzZGqri8fWfSwZrV5Ht5VtYn"
                   # The Elasticsearch host to communicate with
                   - name: ELASTICSEARCH_HOST
-                    value: "https://elasticsearch"
+                    value: "https://snapshot-fd497c.es.us-west2.gcp.elastic-cloud.com"
                   # The Elasticsearch port to communicate with
                   - name: ELASTICSEARCH_PORT
-                    value: "9200"
+                    value: "443"
            volumeMounts:
                   - name: config
                     mountPath: /usr/share/inputrunner/inputrunner.yml

input/assets_k8s/assets_k8s.go → input/assets/k8s/assets_k8s.go

@@ -15,13 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package assets_k8s
+package k8s
 
 import (
 	"context"
 	"fmt"
 	"time"
 
+	"github.com/elastic/inputrunner/input/assets"
 	input "github.com/elastic/inputrunner/input/v2"
 	stateless "github.com/elastic/inputrunner/input/v2/input-stateless"
 
@@ -62,14 +63,14 @@ func newAssetsK8s(cfg config) (*assetsK8s, error) {
 }
 
 type config struct {
-	BaseConfig `config:",inline"`
-	KubeConfig string        `config:"kube_config"`
-	Period     time.Duration `config:"period"`
+	assets.BaseConfig `config:",inline"`
+	KubeConfig        string        `config:"kube_config"`
+	Period            time.Duration `config:"period"`
 }
 
 func defaultConfig() config {
 	return config{
-		BaseConfig: BaseConfig{
+		BaseConfig: assets.BaseConfig{
 			Period:     time.Second * 600,
 			AssetTypes: nil,
 		},
@@ -140,11 +141,11 @@ func collectK8sAssets(ctx context.Context, kubeconfigPath string, log *logp.Logg
 		log.Errorf("unable to build kubernetes clientset: %w", err)
 	}
 	log.Infof("Enabled asset types are %+v", cfg.AssetTypes)
-	if IsTypeEnabled(cfg.AssetTypes, "node") {
+	if assets.IsTypeEnabled(cfg.AssetTypes, "node") {
 		log.Info("Node type enabled. Starting collecting")
 		go collectK8sNodes(ctx, log, client, publisher)
 	}
-	if IsTypeEnabled(cfg.AssetTypes, "pod") {
+	if assets.IsTypeEnabled(cfg.AssetTypes, "pod") {
 		log.Info("Pod type enabled. Starting collecting")
 		go collectK8sPods(ctx, log, client, publisher)
 	}

input/assets_k8s/asstes_k8s_test.go → input/assets/k8s/asstes_k8s_test.go

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package assets_k8s
+package k8s
 
 import (
 	"testing"