Skip to content

Commit

Permalink
Use external docker image registry, removed self deps and templates
Browse files Browse the repository at this point in the history
  • Loading branch information
wangeguo committed Jan 28, 2023
1 parent ded9952 commit fc12c66
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 151 deletions.
26 changes: 13 additions & 13 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.3.7
version: 0.4.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
Expand All @@ -24,22 +24,22 @@ version: 0.3.7
appVersion: "0.1.0"

dependencies:
- name: cert-manager
repository: https://charts.jetstack.io
version: 1.11.0
condition: cert-manager.enabled
# - name: cert-manager
# repository: https://charts.jetstack.io
# version: 1.11.0
# condition: cert-manager.enabled
- name: amphitheatre-crds
version: 0.1.0
condition: crds.enabled
- name: harbor
repository: https://charts.bitnami.com/bitnami
version: 16.1.0
condition: harbor.enabled
# - name: harbor
# repository: https://charts.bitnami.com/bitnami
# version: 16.1.0
# condition: harbor.enabled
- name: kpack
repository: https://charts.amphitheatre.app
version: 0.1.0
condition: kpack.enabled
- name: ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx
version: 4.4.2
condition: ingress-nginx.enabled
# - name: ingress-nginx
# repository: https://kubernetes.github.io/ingress-nginx
# version: 4.4.2
# condition: ingress-nginx.enabled

This file was deleted.

12 changes: 0 additions & 12 deletions charts/amphitheatre/templates/harbor/secret.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions charts/amphitheatre/templates/kpack/cluster-builder.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions charts/amphitheatre/templates/kpack/cluster-stack.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions charts/amphitheatre/templates/kpack/cluster-store.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions charts/amphitheatre/templates/kpack/service-account.yaml

This file was deleted.

124 changes: 80 additions & 44 deletions charts/amphitheatre/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,91 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

registry: registry.amphitheatre.app
## Global parameters
# registry: registry.amphitheatre.app

## Amphitheatre CRDs Parameters
crds:
# Switch to enable or disable the amphitheatre-crds helm chart
enabled: true

cert-manager:
enabled: true
installCRDs: true
podDnsPolicy: "Default"
# podDnsConfig:
# nameservers:
# - "1.1.1.1"
# - "8.8.8.8"

harbor:
enabled: true
fullnameOverride: harbor
adminPassword: "Harbor12345"

# externalURL: harbor.amp-system.svc.cluster.local
# exposureType: proxy
# service:
# type: ClusterIP
# nginx:
# tls:
# enabled: false

externalURL: registry.amphitheatre.app
exposureType: ingress
ingress:
core:
hostname: registry.amphitheatre.app
annotations:
ingress.kubernetes.io/ssl-redirect: 'true'
ingress.kubernetes.io/proxy-body-size: '0'
nginx.ingress.kubernetes.io/ssl-redirect: 'true'
nginx.ingress.kubernetes.io/proxy-body-size: '0'
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: lets-encrypt-cluster-issuer
cert-manager.io/issue-temporary-certificate: "true"
acme.cert-manager.io/http01-edit-in-place: "true"
tls: true
# ## Cert Manager Parameters
# cert-manager:
# # Switch to enable or disable the cert-manager helm chart
# enabled: false
# installCRDs: true
# # podDnsPolicy: "Default"
# # podDnsConfig:
# # nameservers:
# # - "1.1.1.1"
# # - "8.8.8.8"

# ## Harbor Parameters
# harbor:
# # # Switch to enable or disable the harbor helm chart
# # enabled: true
# # # String to fully override common.names.fullname template with a string
# # fullnameOverride: harbor
# # # The initial password of Harbor admin.
# # adminPassword: "Harbor12345"

# # # # The external URL for Harbor Core service
# # externalURL: https://registry.amphitheatre.app
# # # The way to expose Harbor. Allowed values are [ ingress | proxy ]
# # # Use "proxy" to use a deploy NGINX proxy in front of Harbor services
# # exposureType: proxy
# # # Service parameters
# # service:
# # # NGINX proxy service type
# # type: ClusterIP
# # # Additional custom annotations for NGINX proxy service
# # annotations:
# # # cert-manager.io/cluster-issuer: lets-encrypt-cluster-issuer
# # # cert-manager.io/issue-temporary-certificate: "true"
# # # acme.cert-manager.io/http01-edit-in-place: "true"
# # # NGINX Parameters
# # nginx:
# # # TLS parameters
# # tls:
# # # Enable TLS termination
# # enabled: true
# # # existingSecret: harbor-nginx-proxy-certificate
# # # The common name used to generate the self-signed TLS certificates
# # commonName: registry.amphitheatre.app

# # # # The external URL for Harbor Core service
# # externalURL: https://registry.amphitheatre.app
# # # The way to expose Harbor. Allowed values are [ ingress | proxy ]
# # # Use "ingress" to use an Ingress Controller as proxy
# # exposureType: ingress
# # # Ingress parameters
# # ingress:
# # # Configure the ingress resource that allows you to access Harbor Core
# # core:
# # # Default host for the ingress record
# # hostname: registry.amphitheatre.app
# # # Additional annotations for the Ingress resource
# # annotations:
# # kubernetes.io/ingress.class: nginx
# # ingress.kubernetes.io/ssl-redirect: 'true'
# # ingress.kubernetes.io/proxy-body-size: '0'
# # nginx.ingress.kubernetes.io/ssl-redirect: 'true'
# # nginx.ingress.kubernetes.io/proxy-body-size: '0'
# # cert-manager.io/cluster-issuer: lets-encrypt-cluster-issuer
# # # cert-manager.io/issue-temporary-certificate: "true"
# # # acme.cert-manager.io/http01-edit-in-place: "true"
# # tls: true

## Kpack Parameters
kpack:
# Switch to enable or disable the kpack helm chart
enabled: true

ingress-nginx:
enabled: true
controller:
kind: DaemonSet
service:
enableHttps: true
# ## Ingress Nginx Parameters
# ingress-nginx:
# # Switch to enable or disable the ingress-nginx helm chart
# enabled: false
# controller:
# kind: DaemonSet
# service:
# enableHttps: true

0 comments on commit fc12c66

Please sign in to comment.