From afc4d6da4e0c2e4682df6049a3ea9f7c77f9cc7c Mon Sep 17 00:00:00 2001
From: cloudbees-gam-casc <galonsomartinez@workshop.cb-sa.io>
Date: Thu, 19 Jan 2023 17:02:59 +0000
Subject: [PATCH] updating cloudbees-gam-casc/ops-controller bundle for
 bundle-inheritance

---
 bundle/bundle.yaml         |  5 ++---
 bundle/jcasc/jenkins.yaml  | 21 ++-------------------
 bundle/plugin-catalog.yaml |  9 ---------
 bundle/plugins.yaml        | 28 ----------------------------
 4 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 bundle/plugin-catalog.yaml

diff --git a/bundle/bundle.yaml b/bundle/bundle.yaml
index d378a3e..cbe1416 100644
--- a/bundle/bundle.yaml
+++ b/bundle/bundle.yaml
@@ -1,7 +1,8 @@
 apiVersion: "1"
-version: "3"
+version: "4"
 id: "cloudbees-gam-casc-ops-controller"
 description: "CloudBees CI configuration bundle for the cloudbees-gam-casc ops-controller Controller"
+parent: "base"
 availabilityPattern: "cloudbees-ci-casc-workshop/cloudbees-gam-casc/ops-controller"
 jcasc:
   - "jcasc/"
@@ -9,5 +10,3 @@ plugins:
   - "plugins.yaml"
 items:
   - "items.yaml"
-catalog:
-  - "plugin-catalog.yaml"
diff --git a/bundle/jcasc/jenkins.yaml b/bundle/jcasc/jenkins.yaml
index a864454..55e9862 100644
--- a/bundle/jcasc/jenkins.yaml
+++ b/bundle/jcasc/jenkins.yaml
@@ -10,25 +10,8 @@ jenkins:
         value: "${GITHUB_USER}"
       - key: "BUNDLE_ID"
         value: "${CASC_BUNDLE_ID}"
-  quietPeriod: 0
-  systemMessage: 'Jenkins configured using CloudBees CI CasC v3'
-notificationConfiguration:
-  enabled: true
-  router: "operationsCenter"
+  systemMessage: 'Jenkins configured using CloudBees CI CasC with controller overrides'
 unclassified:
-  hibernationConfiguration:
-    activities:
-    - "build"
-    - "web"
-    enabled: true
-    gracePeriod: 1500
-  gitHubConfiguration:
-    apiRateLimitChecker: ThrottleForNormalize
-  gitHubPluginConfig:
-    hookSecretConfigs:
-    - credentialsId: "cloudbees-ci-workshop-github-webhook-secret"
-  globalDefaultFlowDurabilityLevel:
-    durabilityHint: PERFORMANCE_OPTIMIZED
   globallibraries:
     libraries:
     - defaultVersion: "main"
@@ -41,4 +24,4 @@ unclassified:
               repoOwner: "${GITHUB_ORGANIZATION}"
               repository: "pipeline-library"
   headerLabel:
-    text: "${GITHUB_APP}-bundle-v3"
+    text: "${GITHUB_APP}-bundle-v4"
diff --git a/bundle/plugin-catalog.yaml b/bundle/plugin-catalog.yaml
deleted file mode 100644
index f1ecc9f..0000000
--- a/bundle/plugin-catalog.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-type: plugin-catalog
-version: '1'
-name: ops-controller
-displayName: Autogenerated catalog from ops-controller
-configurations:
-- description: Exported plugins
-  includePlugins:
-    pipeline-utility-steps:
-      version: 2.13.0
diff --git a/bundle/plugins.yaml b/bundle/plugins.yaml
index 5d65aac..772ad7e 100644
--- a/bundle/plugins.yaml
+++ b/bundle/plugins.yaml
@@ -1,31 +1,3 @@
 plugins:
-- id: antisamy-markup-formatter
-- id: cloudbees-casc-client
-- id: cloudbees-casc-items-api
-- id: cloudbees-casc-items-commons
-- id: cloudbees-casc-items-controller
-- id: cloudbees-github-reporting
-- id: cloudbees-groovy-view
-- id: cloudbees-monitoring
-- id: cloudbees-pipeline-policies
-- id: cloudbees-restricted-credentials
-- id: cloudbees-slack
-- id: cloudbees-template
-- id: cloudbees-view-creation-filter
-- id: cloudbees-workflow-template
-- id: cloudbees-workflow-ui
-- id: configuration-as-code
-- id: git
-- id: github-branch-source
-- id: managed-master-hibernation
-- id: notification-api
-- id: operations-center-cloud
-- id: operations-center-notification
-- id: pipeline-event-step
-- id: pipeline-model-extensions
-- id: pipeline-stage-view
-- id: warnings-ng
-- id: workflow-aggregator
-- id: workflow-cps-checkpoint
 # non-cap plugins
 - id: pipeline-utility-steps