Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 8 additions & 23 deletions apps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ helmfiles:
- domain: sthings-infra-dev.example.com
- ingressClassName: nginx
- createCertificateResource: true
- certicates:
- certificates:
nginx:
hostname: webserver
domain: sthings-infra-dev.example.com
Expand Down Expand Up @@ -333,29 +333,14 @@ EOF

<details><summary>HARBOR</summary>

### w/ INGRESS + CERT (INGRESS ANNOTATION - CERT-MANAGER)

```bash
cat <<EOF > harbor.yaml
---
helmfiles:
- path: git::https://github.com/stuttgart-things/helm.git@apps/harbor.yaml
values:
- namespace: harbor
- enablePersistence: true
- storageClass: standard
- issuerName: selfsigned
- issuerKindCert: ClusterIssuer
- issuerKind: cluster-issuer
- hostname: harbor
- domain: 172.18.0.5.nip.io
- ingressClassName: nginx
- adminPassword: halloHarborTest123
- pvSizeRegistry: 12Gi
- pvSizeTrivy: 5Gi
- pvSizeJobService: 1Gi
EOF
```
export HARBOR_PASSWORD=<REPLACE-ME>

</details>
helmfile apply -f git::https://github.com/stuttgart-things/helm.git@apps/harbor.yaml.gotmpl \
--state-values-set-string "namespace=harbor,domain=idp.kubermatic.sva.dev,issuerName=letsencrypt-prod,storageClass=vsphere-csi,adminPassword=${HARBOR_PASSWORD}"
```

<details><summary>MINIO</summary>

Expand Down Expand Up @@ -399,7 +384,7 @@ helmfiles:
- hostnameApi: artifacts
- storageClass: openebs-hostpath
- createCertificateResource: true
- certicates:
- certificates:
api:
hostname: artifacts
domain: sthings-infra-dev.example.com
Expand Down
23 changes: 18 additions & 5 deletions apps/harbor.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,46 @@ environments:
- namespace: harbor
- enablePersistence: true
- storageClass: standard
- issuerName: selfsigned
- issuerKindCert: ClusterIssuer
- issuerKind: cluster-issuer
- hostname: harbor
- domain: 172.18.0.5.nip.io
- ingressClassName: nginx
- adminPassword: halloHarborTest123
- pvSizeRegistry: 12Gi
- pvSizeTrivy: 5Gi
- pvSizeJobService: 1Gi
- hostname: harbor
- domain: example.com
- issuerName: selfsigned
- issuerKind: ClusterIssuer
- issuerKindAnnotation: cluster-issuer
- createCertificateResource: false
- certificates:
harbor:
hostname: {{ .Values.hostname }}
domain: {{ .Values.domain }}
issuerName: {{ .Values.issuerName }}
issuerKind: {{ .Values.issuerKind }}
namespace: {{ .Values.namespace }}
secretName: {{ .Values.hostname }}.{{ .Values.domain }}-tls
---
releases:
{{- if .Values.createCertificateResource }}
- name: certificate-configuration
installed: true
namespace: {{ .Values.namespace }}
chart: stuttgart-things/sthings-cluster
version: 0.3.15
values:
- "values/certificate.values.yaml.gotmpl"
{{- end }}

- name: harbor
installed: true
namespace: {{ .Values.namespace }}
chart: bitnami/harbor
version: {{ .Values.version }}
{{- if .Values.createCertificateResource }}
needs:
- {{ .Values.namespace }}/certificate-configuration
{{- end }}
values:
- "values/harbor.values.yaml.gotmpl"

Expand Down
2 changes: 1 addition & 1 deletion apps/minio.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ environments:
- imageVolumePermissionsPullPolicy: IfNotPresent
- imageVolumeContainerEnabled: false
- createCertificateResource: false
- certicates:
- certificates:
api:
hostname: artifacts
domain: 172.18.0.2.nip.io
Expand Down
2 changes: 1 addition & 1 deletion apps/nginx.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ environments:
- serviceNodePortHttp: ""
- serviceNodePortHttps: ""
- createCertificateResource: false
- certicates:
- certificates:
nginx:
hostname: webserver
domain: 172.18.0.2.nip.io
Expand Down
2 changes: 1 addition & 1 deletion apps/values/certificate.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
customresources:
{{- range $k, $v := $.Values.certicates }}
{{- range $k, $v := $.Values.certificates }}
{{ $k }}:
apiVersion: cert-manager.io/v1
kind: Certificate
Expand Down
55 changes: 53 additions & 2 deletions apps/values/harbor.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,8 +1,49 @@
---
externalURL: {{ .Values.hostname }}.{{ .Values.domain }}
clusterDomain: {{ .Values.domain }}
clusterDomain: cluster.local
adminPassword: {{ .Values.adminPassword }}

global:
imageRegistry: docker.io

nginx:
image:
repository: bitnamilegacy/nginx

portal:
image:
repository: bitnamilegacy/harbor-portal

core:
image:
repository: bitnamilegacy/harbor-core

jobservice:
image:
repository: bitnamilegacy/harbor-jobservice

registry:
server:
image:
repository: bitnamilegacy/harbor-registry
controller:
image:
repository: bitnamilegacy/harbor-registryctl

trivy:
image:
repository: bitnamilegacy/harbor-adapter-trivy

exporter:
image:
repository: bitnamilegacy/harbor-exporter

volumePermissions:
image:
repository: bitnamilegacy/os-shell



exposureType: ingress
service:
type: ClusterIP
Expand All @@ -23,7 +64,9 @@ ingress:
- {{ .Values.hostname }}.{{ .Values.domain }}
secretName: {{ .Values.hostname }}.{{ .Values.domain }}-tls
annotations:
cert-manager.io/{{ .Values.issuerKind }}: "{{ .Values.issuerName }}"
{{- if not .Values.createCertificateResource }}
cert-manager.io/{{ .Values.issuerKindAnnotation }}: "{{ .Values.issuerName }}"
{{- end }}
ingress.kubernetes.io/ssl-redirect: "true"
ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/ssl-redirect: "true"
Expand All @@ -45,3 +88,11 @@ persistence:
jobservice:
size: {{ .Values.pvSizeJobService }}
{{- end }}

postgresql:
image:
repository: bitnamilegacy/postgresql

redis:
image:
repository: bitnamilegacy/redis
2 changes: 1 addition & 1 deletion cicd/argocd.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
- ingressClassName: nginx
- issuerName: selfsigned
- issuerKind: ClusterIssuer
- certicates:
- certificates:
argocd:
hostname: {{ .Values.hostname }}
domain: {{ .Values.domain }}
Expand Down
2 changes: 1 addition & 1 deletion cicd/values/certificate.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
customresources:
{{- range $k, $v := $.Values.certicates }}
{{- range $k, $v := $.Values.certificates }}
{{ $k }}:
apiVersion: cert-manager.io/v1
kind: Certificate
Expand Down
2 changes: 1 addition & 1 deletion cicd/values/crossplane-functions.values.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ customresources:
name: {{ $fn.name | required (printf "functions.%s.name is required" $key) }}
spec:
package: {{ printf "%s:%s" $fn.image $fn.tag | required (printf "functions.%s.image and tag are required" $key) }}
{{- end }}
{{- end }}
Loading