github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-07-06 21:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update provider.go, consts.go, and mizuRunner.go

Browse Source
This commit is contained in:
RamiBerm 2021-05-10 16:03:01 +03:00
parent 84a647a49d
commit d817f5b3d3
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cli/kubernetes/provider.go
View File

@ -32,7 +32,6 @@ type Provider struct {
const ( const (
serviceAccountName = "mizu-service-account" serviceAccountName = "mizu-service-account"
MizuResourcesNamespace = "default"
) )
func NewProvider(kubeConfigPath string, overrideNamespace string) *Provider { func NewProvider(kubeConfigPath string, overrideNamespace string) *Provider {
@ -70,16 +69,16 @@ func (provider *Provider) GetPodWatcher(ctx context.Context, namespace string) w
return watcher return watcher
} }
func (provider *Provider) GetPods(ctx context.Context) { func (provider *Provider) GetPods(ctx context.Context, namespace string) {
pods, err := provider.clientSet.CoreV1().Pods(provider.Namespace).List(ctx, metav1.ListOptions{}) pods, err := provider.clientSet.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{})
if err != nil { if err != nil {
panic(err.Error()) panic(err.Error())
} }
fmt.Printf("There are %d pods in Namespace %s\n", len(pods.Items), provider.Namespace) fmt.Printf("There are %d pods in Namespace %s\n", len(pods.Items), namespace)
} }
func (provider *Provider) CreateMizuPod(ctx context.Context, podName string, podImage string, tappedPodName string) (*core.Pod, error) { func (provider *Provider) CreateMizuPod(ctx context.Context, namespace string, podName string, podImage string, tappedPodNamespace string, tappedPodName string) (*core.Pod, error) {
tappedPod, err := provider.clientSet.CoreV1().Pods(provider.Namespace).Get(ctx, tappedPodName, metav1.GetOptions{}) tappedPod, err := provider.clientSet.CoreV1().Pods(tappedPodNamespace).Get(ctx, tappedPodName, metav1.GetOptions{})
if err != nil { if err != nil {
panic(err.Error()) panic(err.Error())
} }
@ -94,7 +93,7 @@ func (provider *Provider) CreateMizuPod(ctx context.Context, podName string, pod
pod := &core.Pod{ pod := &core.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: podName, Name: podName,
Namespace: MizuResourcesNamespace, Namespace: namespace,
}, },
Spec: core.PodSpec{ Spec: core.PodSpec{
HostNetwork: true, // very important to make passive tapper see traffic HostNetwork: true, // very important to make passive tapper see traffic
@ -123,11 +122,11 @@ func (provider *Provider) CreateMizuPod(ctx context.Context, podName string, pod
NodeSelector: map[string]string{"kubernetes.io/hostname": tappedPod.Spec.NodeName}, NodeSelector: map[string]string{"kubernetes.io/hostname": tappedPod.Spec.NodeName},
}, },
} }
return provider.clientSet.CoreV1().Pods(MizuResourcesNamespace).Create(ctx, pod, metav1.CreateOptions{}) return provider.clientSet.CoreV1().Pods(namespace).Create(ctx, pod, metav1.CreateOptions{})
} }
func (provider *Provider) DoesMizuRBACExist(ctx context.Context) (bool, error){ func (provider *Provider) DoesMizuRBACExist(ctx context.Context, namespace string) (bool, error){
serviceAccount, err := provider.clientSet.CoreV1().ServiceAccounts(MizuResourcesNamespace).Get(ctx, serviceAccountName, metav1.GetOptions{}) serviceAccount, err := provider.clientSet.CoreV1().ServiceAccounts(namespace).Get(ctx, serviceAccountName, metav1.GetOptions{})
var statusError *k8serrors.StatusError var statusError *k8serrors.StatusError
if errors.As(err, &statusError) { if errors.As(err, &statusError) {
@ -142,13 +141,13 @@ func (provider *Provider) DoesMizuRBACExist(ctx context.Context) (bool, error){
return serviceAccount != nil, nil return serviceAccount != nil, nil
} }
func (provider *Provider) CreateMizuRBAC(ctx context.Context, version string) error { func (provider *Provider) CreateMizuRBAC(ctx context.Context, namespace string ,version string) error {
clusterRoleName := "mizu-cluster-role" clusterRoleName := "mizu-cluster-role"
serviceAccount := &core.ServiceAccount{ serviceAccount := &core.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: serviceAccountName, Name: serviceAccountName,
Namespace: MizuResourcesNamespace, Namespace: namespace,
Labels: map[string]string{"mizu-cli-version": version}, Labels: map[string]string{"mizu-cli-version": version},
}, },
} }
@ -179,11 +178,11 @@ func (provider *Provider) CreateMizuRBAC(ctx context.Context, version string) er
{ {
Kind: "ServiceAccount", Kind: "ServiceAccount",
Name: serviceAccountName, Name: serviceAccountName,
Namespace: MizuResourcesNamespace, Namespace: namespace,
}, },
}, },
} }
_, err := provider.clientSet.CoreV1().ServiceAccounts(MizuResourcesNamespace).Create(ctx, serviceAccount, metav1.CreateOptions{}) _, err := provider.clientSet.CoreV1().ServiceAccounts(namespace).Create(ctx, serviceAccount, metav1.CreateOptions{})
if err != nil { if err != nil {
return err return err
} }
@ -198,8 +197,8 @@ func (provider *Provider) CreateMizuRBAC(ctx context.Context, version string) er
return nil return nil
} }
func (provider *Provider) RemovePod(ctx context.Context, podName string) { func (provider *Provider) RemovePod(ctx context.Context, namespace string, podName string) {
provider.clientSet.CoreV1().Pods(MizuResourcesNamespace).Delete(ctx, podName, metav1.DeleteOptions{}) provider.clientSet.CoreV1().Pods(namespace).Delete(ctx, podName, metav1.DeleteOptions{})
} }
func getClientSet(config *restclient.Config) *kubernetes.Clientset { func getClientSet(config *restclient.Config) *kubernetes.Clientset {

1
cli/mizu/consts.go
View File

@ -2,4 +2,5 @@ package mizu
const ( const (
Version = "0.1.0" Version = "0.1.0"
MizuResourcesNamespace = "default"
) )

10
cli/mizu/mizuRunner.go
View File

@ -20,7 +20,7 @@ func Run(tappedPodName string) {
podName := "mizu-collector" podName := "mizu-collector"
createRBACIfNecessary(ctx, kubernetesProvider, cancel) createRBACIfNecessary(ctx, kubernetesProvider, cancel)
go createPodAndPortForward(ctx, kubernetesProvider, cancel, podName, kubernetes.MizuResourcesNamespace, tappedPodName) //TODO convert this to job for built in pod ttl or have the running app handle this go createPodAndPortForward(ctx, kubernetesProvider, cancel, podName, MizuResourcesNamespace, tappedPodName) //TODO convert this to job for built in pod ttl or have the running app handle this
waitForFinish(ctx, cancel) //block until exit signal or error waitForFinish(ctx, cancel) //block until exit signal or error
// TODO handle incoming traffic from tapper using a channel // TODO handle incoming traffic from tapper using a channel
@ -28,7 +28,7 @@ func Run(tappedPodName string) {
//cleanup //cleanup
fmt.Printf("\nremoving pod %s\n", podName) fmt.Printf("\nremoving pod %s\n", podName)
removalCtx, _ := context.WithTimeout(context.Background(), 2 * time.Second) removalCtx, _ := context.WithTimeout(context.Background(), 2 * time.Second)
kubernetesProvider.RemovePod(removalCtx, podName) kubernetesProvider.RemovePod(removalCtx, MizuResourcesNamespace, podName)
} }
func watchPodsForTapping(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc, podRegex *regexp.Regexp) { func watchPodsForTapping(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc, podRegex *regexp.Regexp) {
@ -54,7 +54,7 @@ func watchPodsForTapping(ctx context.Context, kubernetesProvider *kubernetes.Pro
} }
func createPodAndPortForward(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc, podName string, namespace string, tappedPodName string) { func createPodAndPortForward(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc, podName string, namespace string, tappedPodName string) {
pod, err := kubernetesProvider.CreateMizuPod(ctx, podName, config.Configuration.MizuImage, tappedPodName) pod, err := kubernetesProvider.CreateMizuPod(ctx, MizuResourcesNamespace, podName, config.Configuration.MizuImage, kubernetesProvider.Namespace, tappedPodName)
if err != nil { if err != nil {
fmt.Printf("error creating pod %s", err) fmt.Printf("error creating pod %s", err)
cancel() cancel()
@ -103,14 +103,14 @@ func createPodAndPortForward(ctx context.Context, kubernetesProvider *kubernetes
} }
func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) {
mizuRBACExists, err := kubernetesProvider.DoesMizuRBACExist(ctx) mizuRBACExists, err := kubernetesProvider.DoesMizuRBACExist(ctx, MizuResourcesNamespace)
if err != nil { if err != nil {
fmt.Printf("error checking rbac %v", err) fmt.Printf("error checking rbac %v", err)
cancel() cancel()
return return
} }
if !mizuRBACExists { if !mizuRBACExists {
err := kubernetesProvider.CreateMizuRBAC(ctx, Version) err := kubernetesProvider.CreateMizuRBAC(ctx, MizuResourcesNamespace, Version)
if err != nil { if err != nil {
fmt.Printf("error creating rbac %v", err) fmt.Printf("error creating rbac %v", err)
cancel() cancel()