Skip to content

Commit

Permalink
Merge pull request #33 from tharpmt/master
Browse files Browse the repository at this point in the history
Adjust image tags and phpmyadmin password gen
  • Loading branch information
millerjl1701 authored Apr 14, 2023
2 parents 4ff6b4d + 6a8533f commit f0308c3
Show file tree
Hide file tree
Showing 18 changed files with 120 additions and 46 deletions.
Binary file added charts/deploy-image-0.5.2.tgz
Binary file not shown.
Binary file added charts/gitlab-runner-1.0.2.tgz
Binary file not shown.
Binary file added charts/minio-nfs-1.0.2.tgz
Binary file not shown.
Binary file added charts/mysql-1.2.1.tgz
Binary file not shown.
Binary file added charts/rabbitmq-0.1.3.tgz
Binary file not shown.
139 changes: 107 additions & 32 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,20 @@ apiVersion: v1
entries:
deploy-image:
- apiVersion: v2
created: "2022-07-15T10:52:56.885739-04:00"
created: "2023-04-11T12:21:03.46175-04:00"
description: Deploy a container image
digest: 5bb3fe54091fbe3bc4d5e62c74f38c4d65a6d7e088a5537cc9dd0d0b0a470cfe
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
maintainers:
- name: Platforms Group
url: https://www.olcf.ornl.gov/about-olcf/staff-sections/operations/platforms/
name: deploy-image
type: application
urls:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.5.2.tgz
version: 0.5.2
- apiVersion: v2
created: "2023-04-11T12:21:03.461467-04:00"
description: Deploy a container image
digest: a552bb97518985ac2c75475d2ffe23cdca777e66bf6591b8643d89aaf126a5fc
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -15,7 +28,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.5.1.tgz
version: 0.5.1
- apiVersion: v2
created: "2022-07-15T10:52:56.884899-04:00"
created: "2023-04-11T12:21:03.46116-04:00"
description: Deploy a container image
digest: fc88644f6f3630a2b16eda4e23248a8a0805c03704608ac8da080b317dfec014
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -28,7 +41,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.5.0.tgz
version: 0.5.0
- apiVersion: v2
created: "2022-07-15T10:52:56.884022-04:00"
created: "2023-04-11T12:21:03.460854-04:00"
description: Deploy a container image
digest: ba02d0cde8b240aad83ac3d7938a81931d42f5a594f174c40e3ced805df9e8a2
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -41,7 +54,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.4.1.tgz
version: 0.4.1
- apiVersion: v2
created: "2022-07-15T10:52:56.883159-04:00"
created: "2023-04-11T12:21:03.46053-04:00"
description: Deploy a container image
digest: dfe8df9690c29eb1ede26bfbcfdd2fc2fee471d7632755c5b0cdb5b13b188b8b
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -54,7 +67,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.4.0.tgz
version: 0.4.0
- apiVersion: v2
created: "2022-07-15T10:52:56.8822-04:00"
created: "2023-04-11T12:21:03.460245-04:00"
description: Deploy a container image
digest: c81879c1fc7f77426819a1b9c19de7c6f97fe4d2e2af0b9a3d7d0302b4116694
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -67,7 +80,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.3.2.tgz
version: 0.3.2
- apiVersion: v2
created: "2022-07-15T10:52:56.881303-04:00"
created: "2023-04-11T12:21:03.459948-04:00"
description: Deploy a container image
digest: 720528c098adc2348168614990bdca5aa4516aee4b17394beaf224eb92cb8b1b
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -80,7 +93,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.3.1.tgz
version: 0.3.1
- apiVersion: v2
created: "2022-07-15T10:52:56.880328-04:00"
created: "2023-04-11T12:21:03.459657-04:00"
description: Deploy a container image
digest: fac809a723d80c32b196d073644c12ff37c0db80e573720eea1c7dcfcbcba47a
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -93,7 +106,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.3.0.tgz
version: 0.3.0
- apiVersion: v2
created: "2022-07-15T10:52:56.879308-04:00"
created: "2023-04-11T12:21:03.459329-04:00"
description: Deploy a container image
digest: ee272478b4434a476a9846b0268af2bf7ed25d199833d029011307840b843356
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -106,7 +119,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
created: "2022-07-15T10:52:56.878166-04:00"
created: "2023-04-11T12:21:03.458981-04:00"
description: Deploy a container image
digest: 9b71695737b65ea4f63dba8241b41227f38f6b763ccee5f5308ad7cd3a8e1c42
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -119,7 +132,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/deploy-image-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
created: "2022-07-15T10:52:56.877167-04:00"
created: "2023-04-11T12:21:03.458691-04:00"
description: Deploy a container image
digest: ef90bc4d6bb6fc793101b949e6ef2584a822344604b92d53106a9f92aaf817f3
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
Expand All @@ -133,7 +146,7 @@ entries:
version: 0.1.0
desktop-vnc:
- apiVersion: v2
created: "2022-07-15T10:52:56.886352-04:00"
created: "2023-04-11T12:21:03.461966-04:00"
description: A desktop served over HTTPS with noVNC
digest: ba5edd345d7e7eb0879297d88f3463191380ecedb704e4843a87313d5d8707bf
icon: https://raw.githubusercontent.com/novnc/noVNC/master/app/images/icons/novnc-48x48.png
Expand All @@ -148,7 +161,25 @@ entries:
gitlab-runner:
- apiVersion: v2
appVersion: 14.2.0
created: "2022-07-15T10:52:56.888953-04:00"
created: "2023-04-11T12:21:03.463637-04:00"
dependencies:
- name: library
repository: https://olcf.github.io/slate-helm-charts
version: 0.1.0
description: GitLab Runner
digest: bbeb7475e375289fd803437b5eeb90205c6a51365dc6fc114e1b7a1c04904d28
icon: https://gitlab.com/uploads/-/system/project/avatar/250833/runner_logo.png
maintainers:
- name: Platforms Group
url: https://www.olcf.ornl.gov/about-olcf/staff-sections/operations/platforms/
name: gitlab-runner
type: application
urls:
- https://olcf.github.io/slate-helm-charts/charts/gitlab-runner-1.0.2.tgz
version: 1.0.2
- apiVersion: v2
appVersion: 14.2.0
created: "2023-04-11T12:21:03.462801-04:00"
dependencies:
- name: library
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -166,7 +197,7 @@ entries:
version: 1.0.1
library:
- apiVersion: v2
created: "2022-07-15T10:52:56.889968-04:00"
created: "2023-04-11T12:21:03.463962-04:00"
description: A Helm chart for Kubernetes
digest: 4885c445699386f58d42b67e235171e4ed8877fc9674406b8b4f3e49f4ab756d
name: library
Expand All @@ -175,7 +206,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/library-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
created: "2022-07-15T10:52:56.88962-04:00"
created: "2023-04-11T12:21:03.463746-04:00"
description: A Helm chart for Kubernetes
digest: 10bec7238825dac8ed61f454ad059fae2a2953a2e77c65e2b6fa9cc9080020e1
name: library
Expand All @@ -185,7 +216,21 @@ entries:
version: 0.1.0
minio-nfs:
- apiVersion: v2
created: "2022-07-15T10:52:56.893187-04:00"
created: "2023-04-11T12:21:03.465615-04:00"
description: MinIO Object Storage Server with NetApp persistent storage shared
via NFS
digest: 6980eec987bcc3f97689ff5a2524780e6dfa6c1d89bcf2c93c32ac0d6b315354
icon: https://min.io/resources/img/logo/MINIO_Bird.png
maintainers:
- name: Platforms Group
url: https://www.olcf.ornl.gov/about-olcf/staff-sections/operations/platforms/
name: minio-nfs
type: application
urls:
- https://olcf.github.io/slate-helm-charts/charts/minio-nfs-1.0.2.tgz
version: 1.0.2
- apiVersion: v2
created: "2023-04-11T12:21:03.465189-04:00"
description: MinIO Object Storage Server with NetApp persistent storage shared
via NFS
digest: e520741cc01145a66cc6dd2fb8ac6b4179cb1a9eaa30dc4e00354b3e1c2f00ea
Expand All @@ -199,7 +244,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/minio-nfs-1.0.1.tgz
version: 1.0.1
- apiVersion: v2
created: "2022-07-15T10:52:56.891793-04:00"
created: "2023-04-11T12:21:03.464725-04:00"
description: MinIO Object Storage Server with NetApp persistent storage shared
via NFS
digest: 28bc8f526fdaca89265af839074aaa668ad9ade6e390d98ea49ef100a120f555
Expand All @@ -215,7 +260,7 @@ entries:
version: 1.0.0
mongodb:
- apiVersion: v2
created: "2022-07-15T10:52:56.89511-04:00"
created: "2023-04-11T12:21:03.4663-04:00"
dependencies:
- name: library
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -232,7 +277,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/mongodb-1.1.0.tgz
version: 1.1.0
- apiVersion: v2
created: "2022-07-15T10:52:56.894012-04:00"
created: "2023-04-11T12:21:03.465933-04:00"
description: MongoDB deployment with NetApp persistent storage
digest: b63ebb1a4dd64e970bf56ed2be2d0bd4b08f65adbe376e3bcf4809107bd30dd7
icon: https://media.mongodb.org/ico/icon-leaf.png
Expand All @@ -246,7 +291,20 @@ entries:
version: 1.0.0
mysql:
- apiVersion: v2
created: "2022-07-15T10:52:56.897806-04:00"
created: "2023-04-11T12:21:03.467759-04:00"
description: MySQL deployyment with NetApp persistent storage
digest: c7cc35acee33f4642f23e508d9553c6299f1fc904ecd60910647e9d416bf03be
icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png
maintainers:
- name: Platforms Group
url: https://www.olcf.ornl.gov/about-olcf/staff-sections/operations/platforms/
name: mysql
type: application
urls:
- https://olcf.github.io/slate-helm-charts/charts/mysql-1.2.1.tgz
version: 1.2.1
- apiVersion: v2
created: "2023-04-11T12:21:03.467401-04:00"
description: MySQL deployyment with NetApp persistent storage
digest: e53377c91af01b56dbaae60f09a28ad4237703d02b1e7358bd95119a41dd4d8b
icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png
Expand All @@ -259,7 +317,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/mysql-1.2.0.tgz
version: 1.2.0
- apiVersion: v2
created: "2022-07-15T10:52:56.897172-04:00"
created: "2023-04-11T12:21:03.467054-04:00"
description: MySQL deployyment with NetApp persistent storage
digest: f337e5f30a4ea4a80a0ffdf4b2a55378d8a548b150782fddf540e79b0d5db7fc
icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png
Expand All @@ -272,7 +330,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/mysql-1.1.0.tgz
version: 1.1.0
- apiVersion: v2
created: "2022-07-15T10:52:56.896142-04:00"
created: "2023-04-11T12:21:03.466698-04:00"
description: MySQL deployyment with NetApp persistent storage
digest: 7bebb99a1192afe0304933a8a3874f0f1efab8a2486bc8463252e1830e771ac0
icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png
Expand All @@ -286,7 +344,7 @@ entries:
version: 1.0.0
postgresql:
- apiVersion: v2
created: "2022-07-15T10:52:56.900232-04:00"
created: "2023-04-11T12:21:03.468588-04:00"
dependencies:
- name: library
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -303,7 +361,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/postgresql-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
created: "2022-07-15T10:52:56.899255-04:00"
created: "2023-04-11T12:21:03.468322-04:00"
dependencies:
- name: library
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -320,7 +378,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/postgresql-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
created: "2022-07-15T10:52:56.898572-04:00"
created: "2023-04-11T12:21:03.468037-04:00"
dependencies:
- name: library
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -338,7 +396,24 @@ entries:
version: 0.1.0
rabbitmq:
- apiVersion: v2
created: "2022-07-15T10:52:56.904549-04:00"
created: "2023-04-11T12:21:03.470624-04:00"
dependencies:
- name: deploy-image
repository: https://olcf.github.io/slate-helm-charts
version: 0.4.1
description: A Helm chart for Kubernetes
digest: 5c66de60badaf3242b1ca49c07c7ad3bf84c98554976993600307404f92935bb
icon: https://raw.githubusercontent.com/rabbitmq/rabbitmq-website/live/site/img/rabbitmq_logo_30x30.png
maintainers:
- name: Platforms Group
url: https://www.olcf.ornl.gov/about-olcf/staff-sections/operations/platforms/
name: rabbitmq
type: application
urls:
- https://olcf.github.io/slate-helm-charts/charts/rabbitmq-0.1.3.tgz
version: 0.1.3
- apiVersion: v2
created: "2023-04-11T12:21:03.469889-04:00"
dependencies:
- name: deploy-image
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -355,7 +430,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/rabbitmq-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
created: "2022-07-15T10:52:56.903114-04:00"
created: "2023-04-11T12:21:03.469491-04:00"
dependencies:
- name: deploy-image
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -372,7 +447,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/rabbitmq-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
created: "2022-07-15T10:52:56.90186-04:00"
created: "2023-04-11T12:21:03.46906-04:00"
dependencies:
- name: deploy-image
repository: https://olcf.github.io/slate-helm-charts
Expand All @@ -390,7 +465,7 @@ entries:
version: 0.1.0
redis:
- apiVersion: v2
created: "2022-07-15T10:52:56.909216-04:00"
created: "2023-04-11T12:21:03.471513-04:00"
description: A Helm chart for Kubernetes
digest: 0f436068056e357083677423c582ed9f8644b8d4caacd32e5599c26137a22cf0
icon: https://redis.io/images/redis-small.png
Expand All @@ -403,7 +478,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/redis-0.3.1.tgz
version: 0.3.1
- apiVersion: v2
created: "2022-07-15T10:52:56.906175-04:00"
created: "2023-04-11T12:21:03.471308-04:00"
description: A Helm chart for Kubernetes
digest: 9ff22e3f70458fc6f45f152d331b5b330699ee737f95ec7e19d7922b92c479e9
icon: https://redis.io/images/redis-small.png
Expand All @@ -416,7 +491,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/redis-0.3.0.tgz
version: 0.3.0
- apiVersion: v2
created: "2022-07-15T10:52:56.905662-04:00"
created: "2023-04-11T12:21:03.471116-04:00"
description: A Helm chart for Kubernetes
digest: 91e1508bc7335acf009beabd57e45575df45315b9a95e0552cd18cc96216f0ef
icon: https://redis.io/images/redis-small.png
Expand All @@ -429,7 +504,7 @@ entries:
- https://olcf.github.io/slate-helm-charts/charts/redis-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
created: "2022-07-15T10:52:56.905152-04:00"
created: "2023-04-11T12:21:03.47094-04:00"
description: A Helm chart for Kubernetes
digest: 9822b5a6331830c33a097d21cdfcccf7a9b044bc66c70ce6cdd2fd3b60a7f985
icon: https://redis.io/images/redis-small.png
Expand All @@ -441,4 +516,4 @@ entries:
urls:
- https://olcf.github.io/slate-helm-charts/charts/redis-0.1.0.tgz
version: 0.1.0
generated: "2022-07-15T10:52:56.87565-04:00"
generated: "2023-04-11T12:21:03.45805-04:00"
2 changes: 1 addition & 1 deletion stable/deploy-image/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: deploy-image
description: Deploy a container image
type: application
version: 0.5.1
version: 0.5.2
icon: https://raw.githubusercontent.com/tabler/tabler-icons/master/icons-png/new-section.png
maintainers:
- name: Platforms Group
Expand Down
2 changes: 1 addition & 1 deletion stable/deploy-image/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
replicaCount: 1
image: openshift/hello-openshift:latest
image: docker.io/openshift/hello-openshift:latest

ccs:
filesystems: ""
Expand Down
2 changes: 1 addition & 1 deletion stable/gitlab-runner/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: gitlab-runner
description: GitLab Runner
type: application
version: 1.0.1
version: 1.0.2
appVersion: 14.2.0
icon: https://gitlab.com/uploads/-/system/project/avatar/250833/runner_logo.png
maintainers:
Expand Down
2 changes: 1 addition & 1 deletion stable/gitlab-runner/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Define the image, using .Chart.AppVersion and GitLab Runner image as a default v
*/}}
{{- define "gitlab-runner.image" }}
{{- $appVersion := ternary "bleeding" (print "v" .Chart.AppVersion) (eq .Chart.AppVersion "bleeding") -}}
{{- $image := printf "gitlab/gitlab-runner:alpine-%s" $appVersion -}}
{{- $image := printf "docker.io/gitlab/gitlab-runner:alpine-%s" $appVersion -}}
{{- default $image .Values.image }}
{{- end -}}

Expand Down
Loading

0 comments on commit f0308c3

Please sign in to comment.