remove deprecated integration

sync standalone manifest
elastic · May 4, 2022 · be726fc · be726fc
1 parent dedc754
commit be726fc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/x-pack/plugins/fleet/common/constants/epm.ts b/x-pack/plugins/fleet/common/constants/epm.ts
@@ -17,7 +17,6 @@ export const FLEET_APM_PACKAGE = 'apm';
 export const FLEET_SYNTHETICS_PACKAGE = 'synthetics';
 export const FLEET_KUBERNETES_PACKAGE = 'kubernetes';
 export const FLEET_CLOUD_SECURITY_POSTURE_PACKAGE = 'cloud_security_posture';
-export const FLEET_CLOUD_SECURITY_POSTURE_PACKAGE_DEPRECATED = 'cis_kubernetes_benchmark';
 
 export const FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID =
   'elastic_agent-f47f18cc-9c7d-4278-b2ea-a6dee816d395';

diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/hooks.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/hooks.tsx
@@ -9,21 +9,12 @@ import { i18n } from '@kbn/i18n';
 
 import type { PackagePolicy, AgentPolicy } from '../../types';
 import { sendGetOneAgentPolicy, useStartServices } from '../../hooks';
-
-import {
-  FLEET_KUBERNETES_PACKAGE,
-  FLEET_CLOUD_SECURITY_POSTURE_PACKAGE,
-  FLEET_CLOUD_SECURITY_POSTURE_PACKAGE_DEPRECATED,
-} from '../../../common';
+import { FLEET_KUBERNETES_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_PACKAGE } from '../../../common';
 
 import type { K8sMode } from './types';
 
 // Packages that requires custom elastic-agent manifest
-const K8S_PACKAGES = new Set([
-  FLEET_KUBERNETES_PACKAGE,
-  FLEET_CLOUD_SECURITY_POSTURE_PACKAGE,
-  FLEET_CLOUD_SECURITY_POSTURE_PACKAGE_DEPRECATED,
-]);
+const K8S_PACKAGES = new Set([FLEET_KUBERNETES_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_PACKAGE]);
 
 export function useAgentPolicyWithPackagePolicies(policyId?: string) {
   const [agentPolicyWithPackagePolicies, setAgentPolicy] = useState<AgentPolicy | null>(null);
@@ -75,4 +66,4 @@ export function useIsK8sPolicy(agentPolicy?: AgentPolicy) {
   return { isK8s };
 }
 
-const isK8sPackage = (pkg: PackagePolicy) => K8S_PACKAGES.has(pkg.package?.name || '');
+const isK8sPackage = (pkg: PackagePolicy) => K8S_PACKAGES.has(pkg.package?.name as string);
diff --git a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-export const elasticAgentStandaloneManifest = `
----
+export const elasticAgentStandaloneManifest = `---
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -178,6 +177,7 @@ rules:
       - pods
       - services
       - configmaps
+      - serviceaccounts
     verbs: ["get", "list", "watch"]
   # Enable this rule only if planing to use kubernetes_secrets provider
   #- apiGroups: [""]
@@ -210,6 +210,23 @@ rules:
       - "/metrics"
     verbs:
       - get
+  # required for cloudbeat
+  - apiGroups: ["rbac.authorization.k8s.io"]
+    resources:
+      - clusterrolebindings
+      - clusterroles
+      - rolebindings
+      - roles
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["networking.k8s.io"]
+    resources:
+      - ingressclasses
+      - ingresses
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["policy"]
+    resources:
+      - podsecuritypolicies
+    verbs: ["get", "list", "watch"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -251,8 +268,7 @@ metadata:
 ---
 `;
 
-export const elasticAgentManagedManifest = `
----
+export const elasticAgentManagedManifest = `---
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -457,6 +473,7 @@ rules:
       - "/metrics"
     verbs:
       - get
+  # required for cloudbeat
   - apiGroups: ["rbac.authorization.k8s.io"]
     resources:
       - clusterrolebindings
@@ -512,5 +529,4 @@ metadata:
   labels:
     k8s-app: elastic-agent
 ---
-
 `;