github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-16 14:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Fix more issues in manifests command

Browse Source
This commit is contained in:
M. Mert Yildiran
2023-04-11 02:18:23 +03:00
parent 077fc6c126
commit f19db77228
9 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
kubernetes/provider.go
View File

@@ -235,7 +235,8 @@ func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: opts.PodName,
Name: opts.PodName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{
"app": opts.PodName,
}, provider),
@@ -343,7 +344,8 @@ func (provider *Provider) BuildFrontPod(opts *PodOptions, hubHost string, hubPor
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: opts.PodName,
Name: opts.PodName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{
"app": opts.PodName,
}, provider),
@@ -392,8 +394,9 @@ func (provider *Provider) BuildHubService(namespace string) *core.Service {
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: HubServiceName,
Labels: buildWithDefaultLabels(map[string]string{}, provider),
Name: HubServiceName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{}, provider),
},
Spec: core.ServiceSpec{
Ports: []core.ServicePort{
@@ -416,8 +419,9 @@ func (provider *Provider) BuildFrontService(namespace string) *core.Service {
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: FrontServiceName,
Labels: buildWithDefaultLabels(map[string]string{}, provider),
Name: FrontServiceName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{}, provider),
},
Spec: core.ServiceSpec{
Ports: []core.ServicePort{
@@ -512,7 +516,8 @@ func (provider *Provider) BuildServiceAccount() *core.ServiceAccount {
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: ServiceAccountName,
Name: ServiceAccountName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{
fmt.Sprintf("%s-cli-version", misc.Program): misc.RBACVersion,
}, provider),
@@ -524,10 +529,11 @@ func (provider *Provider) BuildClusterRole() *rbac.ClusterRole {
return &rbac.ClusterRole{
TypeMeta: metav1.TypeMeta{
Kind: "ClusterRole",
APIVersion: "v1",
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: ClusterRoleName,
Name: ClusterRoleName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{
fmt.Sprintf("%s-cli-version", misc.Program): misc.RBACVersion,
}, provider),
@@ -546,10 +552,11 @@ func (provider *Provider) BuildClusterRoleBinding() *rbac.ClusterRoleBinding {
return &rbac.ClusterRoleBinding{
TypeMeta: metav1.TypeMeta{
Kind: "ClusterRoleBinding",
APIVersion: "v1",
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: ServiceAccountName,
Name: ServiceAccountName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{
fmt.Sprintf("%s-cli-version", misc.Program): misc.RBACVersion,
}, provider),
@@ -807,7 +814,8 @@ func (provider *Provider) BuildWorkerDaemonSet(
Kind: "Pod",
},
ObjectMeta: metav1.ObjectMeta{
Name: podName,
Name: podName,
Namespace: config.Config.Tap.SelfNamespace,
Labels: buildWithDefaultLabels(map[string]string{
"app": podName,
}, provider),
@@ -837,7 +845,7 @@ func (provider *Provider) BuildWorkerDaemonSet(
return &DaemonSet{
TypeMeta: metav1.TypeMeta{
Kind: "DaemonSet",
APIVersion: "v1",
APIVersion: "apps/v1",
},
Spec: DaemonSetSpec{
Selector: metav1.LabelSelector{