Bundle Inheritance

bundle/bundle.yaml

@@ -1,13 +1,12 @@
 apiVersion: "1"
-version: "3"
+version: "4"
 id: "jamesflukeworkshoporg-ops-controller"
 description: "CloudBees CI configuration bundle for the jamesflukeworkshoporg ops-controller Controller"
+parent: "base"
 availabilityPattern: "cloudbees-ci-casc-workshop/jamesflukeworkshoporg/ops-controller"
 jcasc:
   - "jcasc/"
 plugins:
   - "plugins.yaml"
 items:
   - "items.yaml"
-catalog:
-  - "plugin-catalog.yaml"

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"

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