From f19db7722866952ae478c54b8996804439f91561 Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 11 Apr 2023 02:18:23 +0300 Subject: [PATCH] :zap: Fix more issues in `manifests` command --- kubernetes/provider.go | 34 ++++++++++++++++---------- manifests/01-service-account.yaml | 1 + manifests/02-cluster-role.yaml | 3 ++- manifests/03-cluster-role-binding.yaml | 3 ++- manifests/04-hub-pod.yaml | 1 + manifests/05-hub-service.yaml | 1 + manifests/06-front-pod.yaml | 1 + manifests/07-front-service.yaml | 1 + manifests/08-worker-daemon-set.yaml | 3 ++- 9 files changed, 32 insertions(+), 16 deletions(-) diff --git a/kubernetes/provider.go b/kubernetes/provider.go index b9caf6962..53b7eef53 100644 --- a/kubernetes/provider.go +++ b/kubernetes/provider.go @@ -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{ diff --git a/manifests/01-service-account.yaml b/manifests/01-service-account.yaml index 972e1510f..6a26a0460 100644 --- a/manifests/01-service-account.yaml +++ b/manifests/01-service-account.yaml @@ -7,3 +7,4 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-service-account + namespace: kubeshark diff --git a/manifests/02-cluster-role.yaml b/manifests/02-cluster-role.yaml index 7368dfce9..46584034e 100644 --- a/manifests/02-cluster-role.yaml +++ b/manifests/02-cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null @@ -7,6 +7,7 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-cluster-role + namespace: kubeshark rules: - apiGroups: - "" diff --git a/manifests/03-cluster-role-binding.yaml b/manifests/03-cluster-role-binding.yaml index 404f5b12d..2ead4cc73 100644 --- a/manifests/03-cluster-role-binding.yaml +++ b/manifests/03-cluster-role-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -7,6 +7,7 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-service-account + namespace: kubeshark roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/manifests/04-hub-pod.yaml b/manifests/04-hub-pod.yaml index 5205f53c7..8ac0d1a83 100644 --- a/manifests/04-hub-pod.yaml +++ b/manifests/04-hub-pod.yaml @@ -7,6 +7,7 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-hub + namespace: kubeshark spec: containers: - command: diff --git a/manifests/05-hub-service.yaml b/manifests/05-hub-service.yaml index 8bac8d107..ffa72931c 100644 --- a/manifests/05-hub-service.yaml +++ b/manifests/05-hub-service.yaml @@ -6,6 +6,7 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-hub + namespace: kubeshark spec: ports: - name: kubeshark-hub diff --git a/manifests/06-front-pod.yaml b/manifests/06-front-pod.yaml index 15f4c0c92..8077952bf 100644 --- a/manifests/06-front-pod.yaml +++ b/manifests/06-front-pod.yaml @@ -7,6 +7,7 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-front + namespace: kubeshark spec: containers: - env: diff --git a/manifests/07-front-service.yaml b/manifests/07-front-service.yaml index b237428e5..2fdc0f409 100644 --- a/manifests/07-front-service.yaml +++ b/manifests/07-front-service.yaml @@ -6,6 +6,7 @@ metadata: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-front + namespace: kubeshark spec: ports: - name: kubeshark-front diff --git a/manifests/08-worker-daemon-set.yaml b/manifests/08-worker-daemon-set.yaml index 9133cde33..1a4693190 100644 --- a/manifests/08-worker-daemon-set.yaml +++ b/manifests/08-worker-daemon-set.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: apps/v1 kind: DaemonSet metadata: creationTimestamp: null @@ -17,6 +17,7 @@ spec: kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark name: kubeshark-worker + namespace: kubeshark spec: containers: - command: