diff --git a/charts/amphitheatre/Chart.yaml b/charts/amphitheatre/Chart.yaml index 8717225..4f012a7 100644 --- a/charts/amphitheatre/Chart.yaml +++ b/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 diff --git a/charts/amphitheatre/crds/playbook.yaml b/charts/amphitheatre/crds/playbook.yaml new file mode 100644 index 0000000..febe027 --- /dev/null +++ b/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: [/][/][:|@].' + 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: {} diff --git a/charts/amphitheatre/templates/NOTES.txt b/charts/amphitheatre/templates/NOTES.txt deleted file mode 100644 index 8f090dd..0000000 --- a/charts/amphitheatre/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "amphitheatre.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "amphitheatre.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "amphitheatre.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "amphitheatre.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/charts/amphitheatre/templates/_helpers.tpl b/charts/amphitheatre/templates/_helpers.tpl deleted file mode 100644 index 646f06b..0000000 --- a/charts/amphitheatre/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "amphitheatre.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "amphitheatre.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "amphitheatre.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "amphitheatre.labels" -}} -helm.sh/chart: {{ include "amphitheatre.chart" . }} -{{ include "amphitheatre.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "amphitheatre.selectorLabels" -}} -app.kubernetes.io/name: {{ include "amphitheatre.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "amphitheatre.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "amphitheatre.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/amphitheatre/templates/cluster-builder.yaml b/charts/amphitheatre/templates/cluster-builder.yaml index 8ba3aaa..e23c578 100644 --- a/charts/amphitheatre/templates/cluster-builder.yaml +++ b/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 diff --git a/charts/amphitheatre/templates/cluster-stack.yaml b/charts/amphitheatre/templates/cluster-stack.yaml index 346d569..56ac075 100644 --- a/charts/amphitheatre/templates/cluster-stack.yaml +++ b/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: diff --git a/charts/amphitheatre/templates/cluster-store.yaml b/charts/amphitheatre/templates/cluster-store.yaml index b96efe7..cfb465a 100644 --- a/charts/amphitheatre/templates/cluster-store.yaml +++ b/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 diff --git a/charts/amphitheatre/templates/deployment.yaml b/charts/amphitheatre/templates/deployment.yaml deleted file mode 100644 index 7a820c7..0000000 --- a/charts/amphitheatre/templates/deployment.yaml +++ /dev/null @@ -1,61 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "amphitheatre.fullname" . }} - labels: - {{- include "amphitheatre.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "amphitheatre.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "amphitheatre.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "amphitheatre.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/amphitheatre/templates/hpa.yaml b/charts/amphitheatre/templates/hpa.yaml deleted file mode 100644 index ccc9447..0000000 --- a/charts/amphitheatre/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "amphitheatre.fullname" . }} - labels: - {{- include "amphitheatre.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "amphitheatre.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/amphitheatre/templates/ingress.yaml b/charts/amphitheatre/templates/ingress.yaml deleted file mode 100644 index 737ccdd..0000000 --- a/charts/amphitheatre/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "amphitheatre.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "amphitheatre.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/amphitheatre/templates/secret.yaml b/charts/amphitheatre/templates/secret.yaml deleted file mode 100644 index 38e9b12..0000000 --- a/charts/amphitheatre/templates/secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: amp-registry-credentials - annotations: - kpack.io/docker: ttl.sh -type: kubernetes.io/basic-auth -stringData: - username: - password: diff --git a/charts/amphitheatre/templates/service.yaml b/charts/amphitheatre/templates/service.yaml deleted file mode 100644 index 9e9830a..0000000 --- a/charts/amphitheatre/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "amphitheatre.fullname" . }} - labels: - {{- include "amphitheatre.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "amphitheatre.selectorLabels" . | nindent 4 }} diff --git a/charts/amphitheatre/templates/serviceaccount.yaml b/charts/amphitheatre/templates/serviceaccount.yaml deleted file mode 100644 index cc39bc1..0000000 --- a/charts/amphitheatre/templates/serviceaccount.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: kpack-service-account -secrets: -- name: amp-registry-credentials -imagePullSecrets: -- name: amp-registry-credentials diff --git a/charts/amphitheatre/templates/tests/test-connection.yaml b/charts/amphitheatre/templates/tests/test-connection.yaml deleted file mode 100644 index a098415..0000000 --- a/charts/amphitheatre/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "amphitheatre.fullname" . }}-test-connection" - labels: - {{- include "amphitheatre.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "amphitheatre.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/charts/amphitheatre/values.yaml b/charts/amphitheatre/values.yaml index 61e298c..32db285 100644 --- a/charts/amphitheatre/values.yaml +++ b/charts/amphitheatre/values.yaml @@ -2,81 +2,16 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 1 +registry: ttl.sh -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: +harbor: enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi -autoscaling: +vcluster: enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 -nodeSelector: {} - -tolerations: [] +mysql: + enabled: false -affinity: {} +kpack: + enabled: true