Switch to admission-controller single helm chart

pkg/kubewarden/chart/kubewarden/policy-server/General.vue

@@ -174,7 +174,7 @@ watchEffect(() => {
 watchEffect(() => {
   if (!controllerApp.value && allApps.value.length) {
     const controller = allApps.value.find(
-      (a) => a.spec?.chart?.metadata?.name === 'kubewarden-controller'
+      (a) => a.spec?.chart?.metadata?.name === 'admission-controller'
     );
 
     if (controller) {

pkg/kubewarden/components/Dashboard/Masthead.vue

@@ -14,8 +14,6 @@ import { newPolicyReportCompatible } from '@kubewarden/modules/policyReporter';
 import { appVersionSatisfiesConstraint, checkUpgradeAvailable } from '@kubewarden/utils/chart';
 import { handleGrowl } from '@kubewarden/utils/handle-growl';
 
-import DefaultsBanner from '@kubewarden/components/DefaultsBanner';
-
 export default {
   props: {
     controllerApp: {
@@ -24,10 +22,7 @@ export default {
     }
   },
 
-  components: {
-    Banner,
-    DefaultsBanner
-  },
+  components: { Banner },
 
   computed: {
     ...mapGetters(['currentCluster']),
@@ -246,7 +241,6 @@ export default {
       </div>
     </div>
 
-    <DefaultsBanner v-if="!hideBannerDefaults" />
   </div>
 </template>
 

pkg/kubewarden/components/Dashboard/__tests__/InstallView.spec.ts

@@ -154,7 +154,7 @@ describe('component: InstallView', () => {
       query:  {
         'repo-type':  'cluster',
         repo:        'kubewarden-charts',
-        chart:       'kubewarden-controller',
+        chart:       'admission-controller',
         version:     '2.0.5'
       }
     });
@@ -202,7 +202,7 @@ describe('component: InstallView', () => {
       query:  {
         'repo-type':  'cluster',
         repo:        'kubewarden-charts',
-        chart:       'kubewarden-controller',
+        chart:       'admission-controller',
         version:     '2.0.6-rc1'
       }
     });

pkg/kubewarden/components/Dashboard/__tests__/Masthead.spec.ts

@@ -37,14 +37,6 @@ describe('component: Masthead', () => {
     });
   };
 
-  it('renders defaults banner when default app is not found', () => {
-    const wrapper = createWrapper();
-
-    const banner = wrapper.findComponent(DefaultsBanner);
-
-    expect(banner.exists()).toBe(true);
-  });
-
   it('renders the Upgradable button when an upgrade is available', () => {
     const oldControllerApp = {
       spec: {

pkg/kubewarden/edit/policies.kubewarden.io.admissionpolicy.vue

@@ -69,7 +69,7 @@ export default {
         if (
           this.isClone &&
           this.value.isKubewardenDefaultPolicy &&
-          this.value?.metadata?.labels?.['app.kubernetes.io/name'] === 'kubewarden-defaults'
+          this.value?.metadata?.labels?.['app.kubernetes.io/name'] === 'admission-controller'
         ) {
           delete this.value?.metadata?.labels?.['app.kubernetes.io/name'];
         }

pkg/kubewarden/edit/policies.kubewarden.io.clusteradmissionpolicy.vue

@@ -69,7 +69,7 @@ export default {
         if (
           this.isClone &&
           this.value.isKubewardenDefaultPolicy &&
-          this.value?.metadata?.labels?.['app.kubernetes.io/name'] === 'kubewarden-defaults'
+          this.value?.metadata?.labels?.['app.kubernetes.io/name'] === 'admission-controller'
         ) {
           delete this.value?.metadata?.labels?.['app.kubernetes.io/name'];
         }

pkg/kubewarden/list/policies.kubewarden.io.policyserver.vue

@@ -7,11 +7,8 @@ import ResourceTable from '@shell/components/ResourceTable';
 
 import { KUBEWARDEN_APPS } from '@kubewarden/types';
 
-import DefaultsBanner from '@kubewarden/components/DefaultsBanner';
-
 export default {
   components: {
-    DefaultsBanner,
     Loading,
     ResourceTable
   },
@@ -64,7 +61,6 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <DefaultsBanner v-if="!hideBannerDefaults" />
     <ResourceTable
       :schema="schema"
       :rows="rows"

pkg/kubewarden/plugins/__tests__/policy-class.spec.ts

@@ -102,7 +102,7 @@ describe('PolicyModel', () => {
       const expectedQuery = {
         [REPO_TYPE]: 'cluster',
         [REPO]:      'kubewarden-charts',
-        [CHART]:     'kubewarden-defaults',
+        [CHART]:     'admission-controller',
         [VERSION]:   '1.2.3'
       };
 
@@ -122,7 +122,7 @@ describe('PolicyModel', () => {
   describe('isKubewardenDefaultPolicy', () => {
     it('returns true when labels match Helm management, defaults, and part-of', () => {
       instance.metadata.labels = {
-        [KUBERNETES.MANAGED_BY]:     'Helm',
+        [KUBERNETES.MANAGED_BY]:     'kubewarden-controller',
         [KUBERNETES.MANAGED_NAME]:   KUBEWARDEN_CHARTS.DEFAULTS,
         'app.kubernetes.io/part-of': KUBEWARDEN_PRODUCT_NAME
       };
@@ -164,7 +164,7 @@ describe('PolicyModel', () => {
   describe('source', () => {
     it('returns "kubewarden-defaults" when policy is default, not deployed with fleet, and not applied', () => {
       instance.metadata.labels = {
-        [KUBERNETES.MANAGED_BY]:     'Helm',
+        [KUBERNETES.MANAGED_BY]:     'kubewarden-controller',
         [KUBERNETES.MANAGED_NAME]:   KUBEWARDEN_CHARTS.DEFAULTS,
         'app.kubernetes.io/part-of': KUBEWARDEN_PRODUCT_NAME
       };

pkg/kubewarden/plugins/policy-class.js

@@ -50,7 +50,7 @@ export default class PolicyModel extends KubewardenModel {
       const query = {
         [REPO_TYPE]: 'cluster',
         [REPO]:      'kubewarden-charts',
-        [CHART]:     'kubewarden-defaults',
+        [CHART]:     'admission-controller',
         [VERSION]:   version
       };
 
@@ -66,7 +66,7 @@ export default class PolicyModel extends KubewardenModel {
 
   get isKubewardenDefaultPolicy() {
     const labels = this.metadata?.labels;
-    const isManagedByHelm = labels?.[KUBERNETES.MANAGED_BY] === 'Helm';
+    const isManagedByHelm = labels?.[KUBERNETES.MANAGED_BY] === 'kubewarden-controller';
     const isKubewardenDefaults = labels?.[KUBERNETES.MANAGED_NAME] === KUBEWARDEN_CHARTS.DEFAULTS;
     const isPartOfKubewarden = labels?.['app.kubernetes.io/part-of'] === KUBEWARDEN_PRODUCT_NAME;
 

pkg/kubewarden/types/kubewarden.ts

@@ -27,13 +27,13 @@ export const KUBEWARDEN_REPOS = {
 };
 
 export const KUBEWARDEN_CHARTS = {
-  CONTROLLER:       'kubewarden-controller',
-  DEFAULTS:         'kubewarden-defaults',
+  CONTROLLER:       'admission-controller',
+  DEFAULTS:         'admission-controller',
 };
 
 export const KUBEWARDEN_APPS = {
-  RANCHER_CONTROLLER: 'rancher-kubewarden-controller',
-  RANCHER_DEFAULTS:   'rancher-kubewarden-defaults'
+  RANCHER_CONTROLLER: 'rancher-admission-controller',
+  RANCHER_DEFAULTS:   'rancher-admission-controller'
 };
 
 export const KUBEWARDEN_LABELS = { POLICY_SERVER: 'kubewarden/policy-server' };

tests/e2e/10-kubewarden.spec.ts

@@ -1,7 +1,6 @@
 import { test, expect } from './rancher/rancher-test'
 import { RancherExtensionsPage } from './rancher/rancher-extensions.page'
 import { AppVersion, KubewardenPage } from './pages/kubewarden.page'
-import { PolicyServersPage } from './pages/policyservers.page'
 import { ClusterAdmissionPoliciesPage } from './pages/policies.page'
 import { RancherAppsPage } from './rancher/rancher-apps.page'
 import { RancherFleetPage } from './rancher/rancher-fleet.page'
@@ -88,23 +87,6 @@ test('Install Kubewarden', { tag: '@kw' }, async({ page, ui, nav }) => {
   await ui.retry(async() => {
     await expect(page.getByRole('heading', { name: 'Welcome to Kubewarden' })).toBeVisible()
   }, 'Kubewarden installation not detected')
-
-  await test.step('Install default policyserver', async() => {
-    const psPage = new PolicyServersPage(page)
-
-    // Banner is visible on Overview page
-    await kwPage.goto()
-    await expect(psPage.noDefaultPsBanner).toBeVisible()
-    // Banner is visible on Policy Servers page
-    await psPage.goto()
-    await expect(psPage.noDefaultPsBanner).toBeVisible()
-
-    await ui.button('Install Chart').click()
-    await expect(page).toHaveURL(/.*\/apps\/charts\/install.*chart=kubewarden-defaults/)
-
-    // Handle PolicyServer Installer Dialog
-    await psPage.installDefault({ recommended: true, mode: 'monitor' })
-  })
 })
 
 test('Install Kubewarden by Fleet', { tag: '@kw' }, async({ page }) => {

tests/e2e/20-dashboard.spec.ts

@@ -8,9 +8,7 @@ test('Check kubewarden resources', async({ page, nav, shell }) => {
   await test.step('Check kubewarden apps', async() => {
     const apps = new RancherAppsPage(page)
     await nav.explorer('Apps', 'Installed Apps')
-    for (const chart of ['controller', 'crds', 'defaults']) {
-      await apps.checkChart(`rancher-kubewarden-${chart}`)
-    }
+    await apps.checkChart('rancher-admission-controller')
     await shell.waitPods()
   })
 
@@ -20,9 +18,9 @@ test('Check kubewarden resources', async({ page, nav, shell }) => {
     // Kubewarden pod labels
     const labels = [
       'app=kubewarden-policy-server-default',
-      'app.kubernetes.io/name=kubewarden-controller',
+      'app.kubernetes.io/name=admission-controller',
       'app.kubernetes.io/name=policy-reporter',
-      'app.kubernetes.io/name=ui']
+      'app.kubernetes.io/name=policy-reporter-ui']
 
     // Ignore known errors
     const ignore = [

tests/e2e/40-policies.spec.ts

@@ -218,7 +218,7 @@ test('Recommended policies', async({ page, ui, nav }) => {
     await ui.tableRow('no-privileged-pod').action('Edit Policy Settings')
 
     const apps = new RancherAppsPage(page)
-    await apps.updateApp('rancher-kubewarden-defaults', {
+    await apps.updateApp('rancher-admission-controller', {
       navigate : false,
       questions: async() => {
         await ui.tab('no-privileged-pod policy settings').click()

tests/e2e/60-telemetry.spec.ts

@@ -77,7 +77,7 @@ test.describe('Tracing', () => {
     await telPage.toBeIncomplete('config')
     await telPage.configBtn.click()
     const now = new Date().toISOString()
-    await appsPage.updateApp('rancher-kubewarden-controller', {
+    await appsPage.updateApp('rancher-admission-controller', {
       navigate : false,
       questions: async() => {
         await ui.tab(/^(Open)?Telemetry/).click()
@@ -123,7 +123,7 @@ test.describe('Tracing', () => {
     test.skip(process.env.MODE === 'fleet')
 
     // Clean up
-    await appsPage.updateApp('rancher-kubewarden-controller', {
+    await appsPage.updateApp('rancher-admission-controller', {
       questions: async() => {
         await ui.tab(/^(Open)?Telemetry/).click()
         await ui.checkbox('Enable Tracing').uncheck()
@@ -190,7 +190,7 @@ test.describe('Metrics', () => {
     await test.step('Enable metrics in controller', async() => {
       await telPage.toBeIncomplete('config')
       await telPage.configBtn.click()
-      await appsPage.updateApp('rancher-kubewarden-controller', {
+      await appsPage.updateApp('rancher-admission-controller', {
         navigate : false,
         questions: async() => {
           await ui.tab(/^(Open)?Telemetry/).click()
@@ -200,6 +200,8 @@ test.describe('Metrics', () => {
       // Wait until kubewarden controller restarts policyserver
       const now = new Date().toISOString()
       await shell.retry(`kubectl logs -l app=kubewarden-policy-server-default -n cattle-kubewarden-system -c otc-container --since-time ${now} | grep -F "Everything is ready."`)
+      // Create metrics stats
+      await shell.privpod({ name: 'tracing-privpod' })
     })
   })
 
@@ -239,7 +241,7 @@ test.describe('Metrics', () => {
 
   test('Uninstall metrics', async({ ui, nav, shell }) => {
     // Disable metrics
-    await appsPage.updateApp('rancher-kubewarden-controller', {
+    await appsPage.updateApp('rancher-admission-controller', {
       questions: async() => {
         await ui.tab(/^(Open)?Telemetry/).click()
         await ui.checkbox('Enable Metrics').uncheck()

tests/e2e/fleet/kubewarden/controller/fleet.yaml

@@ -3,8 +3,8 @@ defaultNamespace: cattle-kubewarden-system
 
 helm:
   version: '*-0'  # 2.0.5
-  releaseName: rancher-kubewarden-controller
-  chart: kubewarden-controller
+  releaseName: rancher-admission-controller
+  chart: admission-controller
   repo: https://charts.kubewarden.io
   # valuesFiles:
   #   - values.yaml
@@ -27,6 +27,8 @@ helm:
             endpoint: "jaeger-operator-jaeger-collector.jaeger.svc.cluster.local:4317"
             tls:
               insecure: true
+    recommendedPolicies:
+      enabled: true
 
 diff:
   comparePatches:
@@ -51,12 +53,9 @@ diff:
         - {"op": "remove", "path":"/webhooks"}
 
 labels:
-  app: rancher-kubewarden-controller
+  app: rancher-admission-controller
 
 dependsOn:
-  - selector:
-      matchLabels:
-        app: rancher-kubewarden-crds
   - selector:
       matchLabels:
         name: opentelemetry