Skip to content

Commit

Permalink
feat(plantuml): Updated image to v1.2023.13
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Hipwell <[email protected]>
  • Loading branch information
stevehipwell committed Dec 13, 2023
1 parent b4e33b8 commit aa697e8
Show file tree
Hide file tree
Showing 11 changed files with 326 additions and 117 deletions.
1 change: 0 additions & 1 deletion .helmdocsignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ k8s-resources
nexus3
node-config
overprovisioner
plantuml
sonarqube
thanos
tigera-operator
Expand Down
24 changes: 22 additions & 2 deletions charts/plantuml/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
---

<!--
## [UNRELEASED]
### Added - For new features.
### Changed - For changes in existing functionality.
### Deprecated - For soon-to-be removed features.
Expand All @@ -20,6 +18,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [UNRELEASED]

## [v3.27.0] - 2023-12-13

### Added

- Added `serviceAccount.labels` value.
- Added support for configuring `HorizontalPodAutoscaler` behaviour with the `autoscaling.behavior` value.
- Added `autoscaling.metrics` value to replace the deprecated `autoscaling.targetCPUUtilizationPercentage` & `autoscaling.targetMemoryUtilizationPercentage` values.
- Added `podDisruptionBudget` value to replace the deprecated `maxUnavailable` variable.

### Changed

- Updated the _PlantUML_ OCI image to [v1.2023.13](https://github.com/plantuml/plantuml-server/releases/tag/v1.2023.13) ([Changes](https://plantuml.com/changes)).
- Changed the pod security policy defaults.
- Changed the PlantUML container security policy defaults.
- Changed the CA certificates init container security policy.

### Deprecated

- Deprecated `autoscaling.targetCPUUtilizationPercentage` value.
- Deprecated `autoscaling.targetMemoryUtilizationPercentage` value.
- Deprecated `podDisruptionBudget` value.

## [v3.26.0] - 2023-10-25

### All Changes
Expand Down
28 changes: 24 additions & 4 deletions charts/plantuml/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
name: plantuml
description: Helm chart for PlantUML.
description: Helm chart for PlantUML Server, a web application to generate UML diagrams on-the-fly.
type: application
version: 3.26.0
appVersion: 1.2023.12
version: 3.27.0
appVersion: 1.2023.13
home: https://plantuml.com/
icon: https://kieranborsden.gallerycdn.vsassets.io/extensions/kieranborsden/plantumllanguageservice/1.1.5.1/1556620084743/Microsoft.VisualStudio.Services.Icons.Default
keywords:
Expand All @@ -19,5 +19,25 @@ maintainers:
email: [email protected]
annotations:
artifacthub.io/changes: |
- kind: added
description: "Added `serviceAccount.labels` value."
- kind: added
description: "Added support for configuring `HorizontalPodAutoscaler` behaviour with the `autoscaling.behavior` value."
- kind: added
description: "Added `autoscaling.metrics` value to replace the deprecated `autoscaling.targetCPUUtilizationPercentage` & `autoscaling.targetMemoryUtilizationPercentage` values."
- kind: added
description: "Added `podDisruptionBudget` value to replace the deprecated `maxUnavailable` variable."
- kind: changed
description: "Updated the PlantUML OCI image to v1.2023.12."
description: "Updated the PlantUML OCI image to v1.2023.13."
- kind: changed
description: "Changed the pod security policy defaults."
- kind: changed
description: "Changed the PlantUML container security policy defaults."
- kind: changed
description: "Changed the CA certificates init container security policy."
- kind: deprecated
description: "Deprecated `autoscaling.targetCPUUtilizationPercentage` value."
- kind: deprecated
description: "Deprecated `autoscaling.targetMemoryUtilizationPercentage` value."
- kind: deprecated
description: "Deprecated `podDisruptionBudget` value."
135 changes: 80 additions & 55 deletions charts/plantuml/README.md

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions charts/plantuml/README.md.gotmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{{ template "chart.header" . }}
{{ template "chart.deprecationWarning" . }}

{{ template "chart.badgesSection" . }}

{{ template "chart.description" . }}

{{ template "chart.homepageLine" . }}

{{ template "chart.maintainersSection" . }}

{{ template "chart.sourcesSection" . }}

## Installing the Chart

To install the chart using the recommended OCI method you can use the following command.

```shell
helm upgrade --install {{ template "chart.name" . }} oci://ghcr.io/stevehipwell/helm-charts/{{ template "chart.name" . }} --version {{ template "chart.version" . }}
```

Alternatively you can use the legacy non-OCI method via the following commands.

```shell
helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
helm upgrade --install {{ template "chart.name" . }} stevehipwell/{{ template "chart.name" . }} --version {{ template "chart.version" . }}
```

{{ template "chart.requirementsSection" . }}

{{ template "chart.valuesSection" . }}

----------------------------------------------

Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs/).
19 changes: 17 additions & 2 deletions charts/plantuml/ci/kubeconform.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
maxUnavailable: 1

autoscaling:
enabled: true
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 80
- type: Resource
resource:
name: memory
target:
type: Utilization
averageUtilization: 80

podDisruptionBudget:
enabled: true
maxUnavailable: 1

caCerts:
enabled: true
7 changes: 7 additions & 0 deletions charts/plantuml/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,15 @@ spec:
image: adoptopenjdk:11-jdk-hotspot
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
privileged: false
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 65532
runAsGroup: 65532
capabilities:
drop:
- ALL
{{- with .Values.env }}
env:
{{- toYaml . | nindent 12 }}
Expand Down
18 changes: 13 additions & 5 deletions charts/plantuml/templates/hpa.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.autoscaling.enabled }}
{{- if and .Values.autoscaling.enabled (or .Values.autoscaling.metrics .Values.autoscaling.targetCPUUtilizationPercentage .Values.autoscaling.targetMemoryUtilizationPercentage) }}
apiVersion: {{ include "plantuml.hpa.apiVersion" . }}
kind: HorizontalPodAutoscaler
metadata:
Expand All @@ -13,21 +13,29 @@ spec:
name: {{ include "plantuml.fullname" . }}
minReplicas: {{ .Values.autoscaling.minReplicas }}
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
{{- with .Values.autoscaling.behavior }}
behavior:
{{- toYaml . | nindent 4 }}
{{- end }}
metrics:
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
{{- if .Values.autoscaling.metrics }}
{{- toYaml .Values.autoscaling.metrics | nindent 4 }}
{{- else }}
{{- with .Values.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
averageUtilization: {{ . }}
{{- end }}
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
{{- with .Values.autoscaling.targetMemoryUtilizationPercentage }}
- type: Resource
resource:
name: memory
target:
type: Utilization
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
averageUtilization: {{ . }}
{{- end }}
{{- end }}
{{- end }}
15 changes: 12 additions & 3 deletions charts/plantuml/templates/pdb.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if gt (int .Values.maxUnavailable) 0 }}
{{- if or (and .Values.podDisruptionBudget.enabled (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable)) .Values.maxUnavailable }}
apiVersion: {{ include "plantuml.pdb.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
Expand All @@ -7,8 +7,17 @@ metadata:
labels:
{{- include "plantuml.labels" . | nindent 4 }}
spec:
maxUnavailable: {{ .Values.maxUnavailable }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "plantuml.name" . }}
{{- include "plantuml.selectorLabels" . | nindent 6 }}
{{- if .Values.maxUnavailable }}
maxUnavailable: {{ .Values.maxUnavailable }}
{{- else }}
{{- with .Values.podDisruptionBudget.minAvailable }}
minAvailable: {{ . }}
{{- end }}
{{- with .Values.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ . }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/plantuml/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "plantuml.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
Loading

0 comments on commit aa697e8

Please sign in to comment.