diff --git a/docker/README.adoc b/docker/README.adoc index dfab12d7..5b205c1e 100644 --- a/docker/README.adoc +++ b/docker/README.adoc @@ -10,7 +10,7 @@ toc::[] [[available-images]] ## Available images -* `killbill/base:latest`: Shared base image with Tomcat and KPM inside Ubuntu 20.04 LTS. It also contains Ansible and our playbooks from https://github.com/killbill/killbill-cloud. It starts Tomcat on startup. +* `killbill/base:latest`: Shared base image with Tomcat and KPM inside Ubuntu 24.04 LTS. It also contains Ansible and our playbooks from https://github.com/killbill/killbill-cloud. It starts Tomcat on startup. * `killbill/killbill:latest`: Empty base Kill Bill image. Includes the `killbill-flyway` utility. It runs `kpm install` on startup. If no custom `kpm.yml` file is specified, the latest version of Kill Bill is downloaded. * `killbill/killbill:0.X.Y`: Image with a specific version of Kill Bill installed. * `killbill/kaui:latest`: Empty base Kaui image. It runs `kpm install` on startup. If no custom `kpm.yml` file is specified, the latest version of Kaui is downloaded. diff --git a/docker/templates/build/Dockerfile b/docker/templates/build/Dockerfile index 30904388..e1825560 100644 --- a/docker/templates/build/Dockerfile +++ b/docker/templates/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:24.04 LABEL maintainer="killbilling-users@googlegroups.com" USER root diff --git a/docker/templates/killbill/latest/killbill.sh b/docker/templates/killbill/latest/killbill.sh index 9829f1e4..e24204f4 100755 --- a/docker/templates/killbill/latest/killbill.sh +++ b/docker/templates/killbill/latest/killbill.sh @@ -7,13 +7,15 @@ echo "Installing plugins..." # Run both the main playbook and the one enabling structured logging $KPM_INSTALL_CMD $KILLBILL_CLOUD_ANSIBLE_ROLES/killbill_json_logging.yml -until mysql --protocol=TCP -h127.0.0.1 -P3306 -uroot -pkillbill -e "SELECT 1"; do +DB_HOST="${DB_HOST:-127.0.0.1}" + +until mysql --protocol=TCP -h"$DB_HOST" -P3306 -uroot -pkillbill -e "SELECT 1"; do echo "Waiting for DB..." sleep 5 done INSTALL_PLUGINS_CMD="$INSTALL_PLUGINS_CMD \ - -e db_config_address=127.0.0.1 \ + -e db_config_address=$DB_HOST \ -e db_config_port=3306 \ -e db_config_username=$KILLBILL_DAO_USER \ -e db_config_password=$KILLBILL_DAO_PASSWORD \ diff --git a/helm/killbill/.helmignore b/helm/killbill/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/helm/killbill/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/helm/killbill/Chart.yaml b/helm/killbill/Chart.yaml new file mode 100644 index 00000000..cc5ae707 --- /dev/null +++ b/helm/killbill/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: killbill +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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.1.0 + +# 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 +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/helm/killbill/templates/NOTES.txt b/helm/killbill/templates/NOTES.txt new file mode 100644 index 00000000..88d93502 --- /dev/null +++ b/helm/killbill/templates/NOTES.txt @@ -0,0 +1,35 @@ +1. Get the application URL by running these commands: +{{- if .Values.httpRoute.enabled }} +{{- if .Values.httpRoute.hostnames }} + export APP_HOSTNAME={{ .Values.httpRoute.hostnames | first }} +{{- else }} + export APP_HOSTNAME=$(kubectl get --namespace {{(first .Values.httpRoute.parentRefs).namespace | default .Release.Namespace }} gateway/{{ (first .Values.httpRoute.parentRefs).name }} -o jsonpath="{.spec.listeners[0].hostname}") + {{- end }} +{{- if and .Values.httpRoute.rules (first .Values.httpRoute.rules).matches (first (first .Values.httpRoute.rules).matches).path.value }} + echo "Visit http://$APP_HOSTNAME{{ (first (first .Values.httpRoute.rules).matches).path.value }} to use your application" + + NOTE: Your HTTPRoute depends on the listener configuration of your gateway and your HTTPRoute rules. + The rules can be set for path, method, header and query parameters. + You can check the gateway configuration with 'kubectl get --namespace {{(first .Values.httpRoute.parentRefs).namespace | default .Release.Namespace }} gateway/{{ (first .Values.httpRoute.parentRefs).name }} -o yaml' +{{- end }} +{{- else 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 "killbill.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 its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "killbill.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "killbill.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 "killbill.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/helm/killbill/templates/_helpers.tpl b/helm/killbill/templates/_helpers.tpl new file mode 100644 index 00000000..35ec1cc2 --- /dev/null +++ b/helm/killbill/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "killbill.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 "killbill.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 "killbill.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "killbill.labels" -}} +helm.sh/chart: {{ include "killbill.chart" . }} +{{ include "killbill.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "killbill.selectorLabels" -}} +app.kubernetes.io/name: {{ include "killbill.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "killbill.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "killbill.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm/killbill/templates/hpa.yaml b/helm/killbill/templates/hpa.yaml new file mode 100644 index 00000000..1cd567c2 --- /dev/null +++ b/helm/killbill/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "killbill.fullname" . }} + labels: + {{- include "killbill.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "killbill.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/helm/killbill/templates/httproute.yaml b/helm/killbill/templates/httproute.yaml new file mode 100644 index 00000000..334f157d --- /dev/null +++ b/helm/killbill/templates/httproute.yaml @@ -0,0 +1,38 @@ +{{- if .Values.httpRoute.enabled -}} +{{- $fullName := include "killbill.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: {{ $fullName }} + labels: + {{- include "killbill.labels" . | nindent 4 }} + {{- with .Values.httpRoute.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + parentRefs: + {{- with .Values.httpRoute.parentRefs }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.httpRoute.hostnames }} + hostnames: + {{- toYaml . | nindent 4 }} + {{- end }} + rules: + {{- range .Values.httpRoute.rules }} + {{- with .matches }} + - matches: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .filters }} + filters: + {{- toYaml . | nindent 8 }} + {{- end }} + backendRefs: + - name: {{ $fullName }} + port: {{ $svcPort }} + weight: 1 + {{- end }} +{{- end }} diff --git a/helm/killbill/templates/kaui-deployment.yaml b/helm/killbill/templates/kaui-deployment.yaml new file mode 100644 index 00000000..b997836b --- /dev/null +++ b/helm/killbill/templates/kaui-deployment.yaml @@ -0,0 +1,39 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: kaui +spec: + replicas: {{ .Values.kaui.replicaCount }} + + selector: + matchLabels: + app: kaui + + template: + metadata: + labels: + app: kaui + + spec: + containers: + - name: kaui + image: "{{ .Values.kaui.image.repository }}:{{ .Values.kaui.image.tag }}" + imagePullPolicy: IfNotPresent + + ports: + - name: http + containerPort: 8080 + protocol: TCP + + env: + - name: KAUI_CONFIG_DAO_USER + value: root + + - name: KAUI_CONFIG_DAO_PASSWORD + value: killbill + + - name: KAUI_CONFIG_DAO_URL + value: jdbc:mysql://mariadb:3306/kaui + + - name: KAUI_KILLBILL_URL + value: http://killbill:8080 diff --git a/helm/killbill/templates/kaui-service.yaml b/helm/killbill/templates/kaui-service.yaml new file mode 100644 index 00000000..b24933e7 --- /dev/null +++ b/helm/killbill/templates/kaui-service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: kaui +spec: + type: ClusterIP + + ports: + - port: {{ .Values.kaui.service.port }} + targetPort: 9090 + protocol: TCP + name: http + + selector: + app: kaui diff --git a/helm/killbill/templates/killbill-deployment.yaml b/helm/killbill/templates/killbill-deployment.yaml new file mode 100644 index 00000000..9648d353 --- /dev/null +++ b/helm/killbill/templates/killbill-deployment.yaml @@ -0,0 +1,55 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: killbill +spec: + replicas: {{ .Values.killbill.replicaCount }} + + selector: + matchLabels: + app: killbill + + template: + metadata: + labels: + app: killbill + + spec: + containers: + - name: killbill + image: "{{ .Values.killbill.image.repository }}:{{ .Values.killbill.image.tag }}" + imagePullPolicy: IfNotPresent + + ports: + - name: http + containerPort: 8080 + + env: + - name: DB_HOST + value: mariadb + + - name: KILLBILL_ADMIN_PASSWORD + value: password + + - name: KILLBILL_DAO_USER + value: root + + - name: KILLBILL_DAO_PASSWORD + value: killbill + + - name: KILLBILL_DAO_URL + value: jdbc:mysql://mariadb:3306/killbill + + readinessProbe: + httpGet: + path: /1.0/healthcheck + port: 8080 + initialDelaySeconds: 30 + periodSeconds: 10 + + livenessProbe: + httpGet: + path: /1.0/healthcheck + port: 8080 + initialDelaySeconds: 60 + periodSeconds: 20 diff --git a/helm/killbill/templates/killbill-service.yaml b/helm/killbill/templates/killbill-service.yaml new file mode 100644 index 00000000..24bc7f25 --- /dev/null +++ b/helm/killbill/templates/killbill-service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: killbill +spec: + type: ClusterIP + + ports: + - port: {{ .Values.killbill.service.port }} + targetPort: 8080 + protocol: TCP + name: http + + selector: + app: killbill diff --git a/helm/killbill/templates/mariadb-deployment.yaml b/helm/killbill/templates/mariadb-deployment.yaml new file mode 100644 index 00000000..af8eebc5 --- /dev/null +++ b/helm/killbill/templates/mariadb-deployment.yaml @@ -0,0 +1,37 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: mariadb +spec: + replicas: 1 + + selector: + matchLabels: + app: mariadb + + template: + metadata: + labels: + app: mariadb + + spec: + containers: + - name: mariadb + image: "{{ .Values.mariadb.image.repository }}:{{ .Values.mariadb.image.tag }}" + + ports: + - name: mysql + containerPort: 3306 + + env: + - name: MYSQL_ROOT_PASSWORD + value: killbill + + readinessProbe: + exec: + command: + - mariadb-admin + - ping + - "-pkillbill" + initialDelaySeconds: 30 + periodSeconds: 10 diff --git a/helm/killbill/templates/mariadb-service.yaml b/helm/killbill/templates/mariadb-service.yaml new file mode 100644 index 00000000..f6a639b7 --- /dev/null +++ b/helm/killbill/templates/mariadb-service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: mariadb +spec: + type: ClusterIP + ports: + - port: {{ .Values.mariadb.service.port }} + targetPort: 3306 + protocol: TCP + name: mysql + selector: + app: mariadb diff --git a/helm/killbill/values.yaml b/helm/killbill/values.yaml new file mode 100644 index 00000000..ecacbd13 --- /dev/null +++ b/helm/killbill/values.yaml @@ -0,0 +1,176 @@ +# Default values for killbill. + +killbill: + replicaCount: 1 + + image: + repository: killbill/killbill + tag: "0.24.21" + + service: + port: 8080 + +kaui: + replicaCount: 1 + + image: + repository: killbill/kaui + tag: "4.0.25" + + service: + port: 9090 + +mariadb: + image: + repository: killbill/mariadb + tag: "0.24" + + service: + port: 3306 + +# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +imagePullSecrets: [] +# This is to override the chart name. +nameOverride: "" +fullnameOverride: "" + +# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/ +serviceAccount: + # Specifies whether a service account should be created. + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: 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: "" + +# This is for setting Kubernetes Annotations to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +podAnnotations: {} +# This is for setting Kubernetes Labels to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/ +service: + # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types + type: ClusterIP + # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports + port: 80 + +# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ +ingress: + 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 + +# -- Expose the service via gateway-api HTTPRoute +# Requires Gateway API resources and suitable controller installed within the cluster +# (see: https://gateway-api.sigs.k8s.io/guides/) +httpRoute: + # HTTPRoute enabled. + enabled: false + # HTTPRoute annotations. + annotations: {} + # Which Gateways this Route is attached to. + parentRefs: + - name: gateway + sectionName: http + # namespace: default + # Hostnames matching HTTP header. + hostnames: + - chart-example.local + # List of rules and filters applied. + rules: + - matches: + - path: + type: PathPrefix + value: /headers + # filters: + # - type: RequestHeaderModifier + # requestHeaderModifier: + # set: + # - name: My-Overwrite-Header + # value: this-is-the-only-value + # remove: + # - User-Agent + # - matches: + # - path: + # type: PathPrefix + # value: /echo + # headers: + # - name: version + # value: v2 + +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 + +# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ +livenessProbe: + httpGet: + path: / + port: http +readinessProbe: + httpGet: + path: / + port: http + +# This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] + # - name: foo + # secret: + # secretName: mysecret + # optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] + # - name: foo + # mountPath: "/etc/foo" + # readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {}