Refactored amphitheatre charts, included crds, removed unused templates

charts/amphitheatre/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.3
+version: 0.2.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -27,12 +27,16 @@ dependencies:
   - name: harbor
     repository: https://charts.bitnami.com/bitnami
     version: 16.1.0
+    condition: harbor.enabled
   - name: vcluster
     repository: https://charts.loft.sh
     version: 0.13.0
+    condition: vcluster.enabled
   - name: mysql
     repository: https://charts.bitnami.com/bitnami
     version: 9.4.5
+    condition: mysql.enabled
   - name: kpack
     repository: https://charts.amphitheatre.app
     version: 0.1.0
+    condition: kpack.enabled

charts/amphitheatre/crds/playbook.yaml

@@ -0,0 +1,96 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: playbooks.amphitheatre.app
+spec:
+  group: amphitheatre.app
+  names:
+    categories: []
+    kind: Playbook
+    plural: playbooks
+    shortNames: []
+    singular: playbook
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns: []
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: Auto-generated derived type for PlaybookSpec via `CustomResource`
+        properties:
+          spec:
+            properties:
+              actors:
+                items:
+                  properties:
+                    commit:
+                      description: The selected commit of the actor.
+                      type: string
+                    description:
+                      description: The description of the actor.
+                      type: string
+                    environment:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    image:
+                      description: 'Specifies the image to launch the container. The image must follow the Open Container Specification addressable image format. such as: [<registry>/][<project>/]<image>[:<tag>|@<digest>].'
+                      type: string
+                    name:
+                      description: The title of the actor.
+                      type: string
+                    partners:
+                      items:
+                        type: string
+                      type: array
+                    path:
+                      description: Relative path from the repo root to the configuration file. eg. getting-started/amp.yaml.
+                      type: string
+                    reference:
+                      description: Git ref the package should be cloned from. eg. master or main
+                      type: string
+                    repo:
+                      description: Git repository the package should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git.
+                      type: string
+                  required:
+                  - commit
+                  - description
+                  - environment
+                  - image
+                  - name
+                  - partners
+                  - path
+                  - reference
+                  - repo
+                  type: object
+                minItems: 1
+                type: array
+              description:
+                type: string
+              title:
+                type: string
+            required:
+            - actors
+            - description
+            - title
+            type: object
+          status:
+            enum:
+            - Pending
+            - Solving
+            - Solved
+            - Building
+            - Running
+            - Succeeded
+            - Failed
+            - Unknown
+            nullable: true
+            type: string
+        required:
+        - spec
+        title: Playbook
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

charts/amphitheatre/templates/cluster-builder.yaml

@@ -1,14 +1,17 @@
 apiVersion: kpack.io/v1alpha2
 kind: ClusterBuilder
 metadata:
-  name: amp-default-builder
+  name: amp-default-cluster-builder
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "-5"
 spec:
-  tag: ttl.sh/amp-default-builder
+  tag: ttl.sh/amp-default-cluster-builder
   stack:
-    name: base
+    name: amp-default-cluster-stack
     kind: ClusterStack
   store:
-    name: default
+    name: amp-default-cluster-store
     kind: ClusterStore
   serviceAccountRef:
     name: kpack-service-account

charts/amphitheatre/templates/cluster-stack.yaml

@@ -1,7 +1,10 @@
 apiVersion: kpack.io/v1alpha2
 kind: ClusterStack
 metadata:
-  name: base
+  name: amp-default-cluster-stack
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "-5"
 spec:
   id: "io.buildpacks.stacks.bionic"
   buildImage:

charts/amphitheatre/templates/cluster-store.yaml

@@ -1,7 +1,10 @@
 apiVersion: kpack.io/v1alpha2
 kind: ClusterStore
 metadata:
-  name: default
+  name: amp-default-cluster-store
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "-5"
 spec:
   sources:
   - image: gcr.io/paketo-buildpacks/java