From 1226ba9d402fcedcf64a8e814931097420e5d6a8 Mon Sep 17 00:00:00 2001 From: momothereal Date: Sat, 30 Nov 2019 22:54:18 -0500 Subject: [PATCH] ChartMuseum --- .gitlab-ci.yml | 23 ++++++++++++++++++++++- chartmuseum/.gitignore | 1 + chartmuseum/secret-template.yaml | 8 ++++++++ chartmuseum/values.yaml | 22 ++++++++++++++++++++++ infra/manifests/ingress.yaml | 8 ++++---- 5 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 chartmuseum/.gitignore create mode 100644 chartmuseum/secret-template.yaml create mode 100644 chartmuseum/values.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30fb6b6..40dc337 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: INFRA_SRC: ${CI_PROJECT_DIR}/infra TEAMSPEAK_SRC: ${CI_PROJECT_DIR}/teamspeak DEFIANT_SRC: ${CI_PROJECT_DIR}/defiant + CHARTMUSEUM_SRC: ${CI_PROJECT_DIR}/defiant IMAGE_PREFIX: registry.gitlab.com/momothereal/momoperes.ca WEBSITE_IMAGE: ${IMAGE_PREFIX}/website @@ -129,9 +130,29 @@ defiant:deploy: # Deploy using helm chart - cd ${DEFIANT_SRC} + - helm init --client-only && helm repo update - helm upgrade --install --force --namespace ${DEPLOY_NAMESPACE} --set image.name=${DEFIANT_IMAGE},image.tag=${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} defiant ./chart/defiant only: refs: - master changes: - - defiant/**/* \ No newline at end of file + - defiant/**/* + +# CHART MUSEUM # + +chartmuseum:deploy: + stage: deploy + image: lwolf/helm-kubectl-docker:v1.15.4-v2.14.3 + script: + - mkdir -p ${KUBECONFIG_PARENT} + - echo ${K8S_CLUSTER_CONFIG} | base64 -d > ${KUBECONFIG} + + # Deploy using helm chart + - cd ${CHARTMUSEUM_SRC} + - helm init --client-only && helm repo update + - helm upgrade --install --force --namespace ${DEPLOY_NAMESPACE} -f values.yaml chartmuseum stable/chartmuseum + only: + refs: + - master + changes: + - chartmuseum/**/* diff --git a/chartmuseum/.gitignore b/chartmuseum/.gitignore new file mode 100644 index 0000000..5f47250 --- /dev/null +++ b/chartmuseum/.gitignore @@ -0,0 +1 @@ +secret.yaml \ No newline at end of file diff --git a/chartmuseum/secret-template.yaml b/chartmuseum/secret-template.yaml new file mode 100644 index 0000000..9044a1b --- /dev/null +++ b/chartmuseum/secret-template.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: chartmuseum-credentials +data: + username: ${USERNAME} + password: ${PASSWORD} diff --git a/chartmuseum/values.yaml b/chartmuseum/values.yaml new file mode 100644 index 0000000..eda0b58 --- /dev/null +++ b/chartmuseum/values.yaml @@ -0,0 +1,22 @@ +env: + existingSecret: chartmuseum-credentials + existingSecretMappings: + BASIC_AUTH_USER: username + BASIC_AUTH_PASS: password + +service: + servicename: chartmuseum + +resources: {} + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 80m + memory: 64Mi + +persistence: + enabled: true + accessMode: ReadWriteOnce + size: 1Gi + storageClass: do-block-storage diff --git a/infra/manifests/ingress.yaml b/infra/manifests/ingress.yaml index d6329aa..afa4f11 100644 --- a/infra/manifests/ingress.yaml +++ b/infra/manifests/ingress.yaml @@ -9,7 +9,7 @@ spec: - hosts: - momoperes.ca - defiant.momoperes.ca - - stream.momoperes.ca + - charts.momoperes.ca secretName: momoperes.ca-wildcard-tls rules: - host: momoperes.ca @@ -30,10 +30,10 @@ spec: backend: serviceName: defiant servicePort: 80 - - host: stream.momoperes.ca + - host: charts.momoperes.ca http: paths: - path: / backend: - serviceName: media-server-radarr - servicePort: 7878 + serviceName: chartmuseum + servicePort: 8080