Skip to content

Commit

Permalink
Deployed harbor with http protocol, and enabled push cluster builder …
Browse files Browse the repository at this point in the history
…to registry
  • Loading branch information
wangeguo committed Jan 5, 2023
1 parent ac30d2c commit fbd7092
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 217 deletions.
10 changes: 1 addition & 9 deletions charts/amphitheatre/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
version: 0.2.11

# 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
Expand All @@ -28,14 +28,6 @@ dependencies:
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
Expand Down
43 changes: 0 additions & 43 deletions charts/amphitheatre/templates/harbor/containerd/config-map.yaml

This file was deleted.

63 changes: 0 additions & 63 deletions charts/amphitheatre/templates/harbor/containerd/daemon-set.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions charts/amphitheatre/templates/harbor/docker/config-map.yaml

This file was deleted.

50 changes: 0 additions & 50 deletions charts/amphitheatre/templates/harbor/docker/daemon-set.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions charts/amphitheatre/templates/harbor/nginx-tls-secret.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions charts/amphitheatre/templates/harbor/secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{{- if .Values.harbor.enabled }}
apiVersion: v1
kind: Secret
metadata:
name: registry-credentials
annotations:
kpack.io/docker: {{ .Values.harbor.externalURL }}
type: kubernetes.io/basic-auth
stringData:
username: admin
password: {{ .Values.harbor.adminPassword }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/amphitheatre/templates/kpack/cluster-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
"helm.sh/hook": post-install
"helm.sh/hook-weight": "-4"
spec:
tag: {{ .Values.registry }}/amp-default-cluster-builder
tag: {{ .Values.registry }}/library/amp-default-cluster-builder
stack:
name: amp-default-cluster-stack
kind: ClusterStack
Expand Down
4 changes: 4 additions & 0 deletions charts/amphitheatre/templates/kpack/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ metadata:
annotations:
"helm.sh/hook": post-install
"helm.sh/hook-weight": "-6"
secrets:
- name: registry-credentials
imagePullSecrets:
- name: registry-credentials
10 changes: 1 addition & 9 deletions charts/amphitheatre/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

runtime: containerd
registry: harbor.amp-system.svc.cluster.local

harbor:
Expand All @@ -15,14 +14,7 @@ harbor:
type: ClusterIP
nginx:
tls:
enabled: true
commonName: harbor.amp-system.svc.cluster.local
existingSecret: nginx-tls-secret
vcluster:
enabled: false

mysql:
enabled: false
enabled: false

kpack:
enabled: true

0 comments on commit fbd7092

Please sign in to comment.