From 140ef8ac916b8fa8210d3034a61c98f1bd9bf2b5 Mon Sep 17 00:00:00 2001
From: Benyamin Hirschberg <59160382+BenHirschbergCa@users.noreply.github.com>
Date: Mon, 23 Aug 2021 13:27:06 +0300
Subject: [PATCH 1/5] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index bb716fba..a5b3751a 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ If you wish to scan all namespaces in your cluster, remove the `--exclude-namesp
# Status
[](https://github.com/armosec/kubescape/actions/workflows/build.yaml)
[]()
+[](https://goreportcard.com/report/github.com/armosec/kubescape)
# How to build
From 789902f53484e1ebf6633207f2420ac730f48134 Mon Sep 17 00:00:00 2001
From: Benyamin Hirschberg <59160382+BenHirschbergCa@users.noreply.github.com>
Date: Mon, 23 Aug 2021 13:30:24 +0300
Subject: [PATCH 2/5] Update README.md
---
README.md | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index a5b3751a..b7cc5bab 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
+[](https://github.com/armosec/kubescape/actions/workflows/build.yaml)
+[]()
+[](https://goreportcard.com/report/github.com/armosec/kubescape)
+
Kubescape is the first tool for testing if Kubernetes is deployed securely as defined in [Kubernetes Hardening Guidance by to NSA and CISA](https://www.nsa.gov/News-Features/Feature-Stories/Article-View/Article/2716980/nsa-cisa-release-kubernetes-hardening-guidance/)
Tests are configured with YAML files, making this tool easy to update as test specifications evolve.
@@ -26,12 +30,6 @@ If you wish to scan all namespaces in your cluster, remove the `--exclude-namesp
-
-# Status
-[](https://github.com/armosec/kubescape/actions/workflows/build.yaml)
-[]()
-[](https://goreportcard.com/report/github.com/armosec/kubescape)
-
# How to build
1. Clone Project
From 747940d66c8febd93680b36a4f985564504f19ad Mon Sep 17 00:00:00 2001
From: Bezbran
Date: Mon, 23 Aug 2021 17:33:43 +0300
Subject: [PATCH 3/5] add some whitespaces
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index b7cc5bab..0481d4d6 100644
--- a/README.md
+++ b/README.md
@@ -80,3 +80,5 @@ The tools retrieves Kubernetes objects from the API server and runs a set of [re
The results by default printed in a pretty "console friendly" manner, but they can be retrieved in JSON format for further processing.
Kubescape is an open source project, we welcome your feedback and ideas for improvement. We’re also aiming to collaborate with the Kubernetes community to help make the tests themselves more robust and complete as Kubernetes develops.
+
+
From 5bec5b0075530d4ba663b599d1ef3716d98313c4 Mon Sep 17 00:00:00 2001
From: Bezbran
Date: Mon, 23 Aug 2021 17:35:48 +0300
Subject: [PATCH 4/5] fix release semvar
---
.github/workflows/build.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fa427313..644dd5b0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,8 +20,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
- tag_name: betav1.0.${{ github.run_number }}
- release_name: Release betav1.0.${{ github.run_number }}
+ tag_name: v1.0.${{ github.run_number }}-beta
+ release_name: Release v1.0.${{ github.run_number }}-beta
draft: false
prerelease: false
build:
From e162d5e8b2a9cc6b1d66955e762c27f29485448e Mon Sep 17 00:00:00 2001
From: Mayo
Date: Tue, 24 Aug 2021 12:05:30 +0800
Subject: [PATCH 5/5] feat: support kubeconfig env
---
cautils/k8sinterface/k8sconfig.go | 18 +++++++-----------
go.mod | 2 +-
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/cautils/k8sinterface/k8sconfig.go b/cautils/k8sinterface/k8sconfig.go
index 15007bdb..84c5ab6b 100644
--- a/cautils/k8sinterface/k8sconfig.go
+++ b/cautils/k8sinterface/k8sconfig.go
@@ -4,15 +4,14 @@ import (
"context"
"fmt"
"os"
- "path/filepath"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
- "k8s.io/client-go/tools/clientcmd"
// DO NOT REMOVE - load cloud providers auth
_ "k8s.io/client-go/plugin/pkg/client/auth"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
)
// K8SConfig pointer to k8s config
@@ -46,20 +45,17 @@ func NewKubernetesApi() *KubernetesApi {
}
}
-var ConfigPath = filepath.Join(os.Getenv("HOME"), ".kube", "config")
+// RunningIncluster whether running in cluster
var RunningIncluster bool
// LoadK8sConfig load config from local file or from cluster
func LoadK8sConfig() error {
- kubeconfig, err := clientcmd.BuildConfigFromFlags("", ConfigPath)
+ kubeconfig, err := config.GetConfig()
if err != nil {
- // kubeconfig, err = restclient.InClusterConfig()
- // if err != nil {
- return fmt.Errorf("Failed to load kubernetes config from file: '%s'.\n", ConfigPath)
- // }
- // RunningIncluster = true
- } else {
- RunningIncluster = false
+ return fmt.Errorf("Failed to load kubernetes config: %s\n", err)
+ }
+ if _, err := restclient.InClusterConfig(); err == nil {
+ RunningIncluster = true
}
K8SConfig = kubeconfig
return nil
diff --git a/go.mod b/go.mod
index eaacf8ca..ce3983ca 100644
--- a/go.mod
+++ b/go.mod
@@ -23,8 +23,8 @@ require (
github.com/satori/go.uuid v1.2.0
golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
- gotest.tools/v3 v3.0.3 // indirect
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
+ sigs.k8s.io/controller-runtime v0.9.6
)