Skip to content

Commit

Permalink
Merge pull request #2 from kingdonb/test-release
Browse files Browse the repository at this point in the history
WIP: Test release
  • Loading branch information
Kingdon Barrett authored Sep 26, 2023
2 parents 0a2dc99 + 4b83d23 commit b4256e2
Show file tree
Hide file tree
Showing 45 changed files with 231 additions and 205 deletions.
18 changes: 18 additions & 0 deletions clones/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
builder/
controller/
dockerbuilder/
fluentd/
logger/
minio/
monitor/
nsqd/
postgres/
redis/
registry/
registry-proxy/
registry-token-refresher/
router/
slugbuilder/
slugrunner/
workflow/
workflow-manager/
20 changes: 20 additions & 0 deletions repositories.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
archetype:
- builder
repos:
- workflow
- controller
- slugbuilder
- dockerbuilder
- slugrunner
- postgres
- fluentd
- redis
- logger
- minio
- monitor
- nsqd
- registry
- registry-proxy
- registry-token-refresher
- router
- workflow-manager
2 changes: 2 additions & 0 deletions workflow/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
charts/*.tgz
Chart.lock
54 changes: 0 additions & 54 deletions workflow/Chart.lock

This file was deleted.

107 changes: 54 additions & 53 deletions workflow/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,59 +1,60 @@
apiVersion: v2
dependencies:
- name: builder
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.13.10
- name: slugbuilder
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.8.2
- name: dockerbuilder
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.8.5
- name: controller
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.22.3
- name: slugrunner
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.7.2
- name: database
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.7.8
- name: fluentd
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.15.3
- name: redis
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.4.5
- name: logger
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.5.3
- name: minio
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.4.7
- name: monitor
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.11.6
- name: nsqd
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.5.4
- name: registry
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.6.3
- name: registry-proxy
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 1.5.3
- name: registry-token-refresher
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 1.2.4
- name: router
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.19.4
- name: workflow-manager
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
version: 2.6.4
description: Hephy Workflow
home: https://github.com/teamhephy/workflow
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: workflow
version: 2.24.0-beta.3
dependencies:
- name: builder
version: "2.13.7"
repository: https://charts.teamhephy.com
- name: slugbuilder
version: "2.8.0"
repository: https://charts.teamhephy.com
- name: dockerbuilder
version: "2.8.3"
repository: https://charts.teamhephy.com
- name: controller
version: "2.23.0"
repository: https://charts-beta.hephy.pro
- name: slugrunner
version: "2.7.0"
repository: https://charts.teamhephy.com
- name: database
version: "2.7.6"
repository: https://charts.teamhephy.com
- name: fluentd
version: "2.15.1"
repository: https://charts.teamhephy.com
- name: redis
version: "2.4.2"
repository: https://charts.teamhephy.com
- name: logger
version: "2.5.1"
repository: https://charts.teamhephy.com
- name: minio
version: "2.4.5"
repository: https://charts.teamhephy.com
- name: monitor
version: "2.11.2"
repository: https://charts.teamhephy.com
- name: nsqd
version: "2.5.1"
repository: https://charts.teamhephy.com
- name: registry
version: "2.6.1"
repository: https://charts.teamhephy.com
- name: registry-proxy
version: "v1.5.1"
repository: https://charts.teamhephy.com
- name: registry-token-refresher
version: "v1.2.2"
repository: https://charts.teamhephy.com
- name: router
version: "2.19.0"
repository: https://charts.teamhephy.com
- name: workflow-manager
version: "2.6.2"
repository: https://charts.teamhephy.com
version: 2.24.0-beta.6
27 changes: 0 additions & 27 deletions workflow/changelog-v2.23.0.md

This file was deleted.

4 changes: 3 additions & 1 deletion workflow/charts/builder/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
description: Git server and application builder for Hephy Workflow.
home: https://github.com/teamhephy/builder
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: builder
version: v2.13.7
version: 2.13.10
6 changes: 5 additions & 1 deletion workflow/charts/builder/templates/builder-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ metadata:
name: deis-builder
labels:
heritage: deis
annotations:
{{- if .Values.global.use_native_ingress }}
external-dns.alpha.kubernetes.io/hostname: deis-builder.{{ .Values.platform_domain }}
{{- end }}
spec:
ports:
- name: ssh
port: 2222
targetPort: 2223
selector:
app: deis-builder
{{ if .Values.global.experimental_native_ingress }}
{{ if .Values.global.use_native_ingress }}
type: "LoadBalancer"
{{ end }}
10 changes: 5 additions & 5 deletions workflow/charts/builder/values.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
org: "hephy"
pull_policy: "IfNotPresent"
pull_policy: "Always"
docker_tag: v2.13.7
# limits_cpu: "100m"
# limits_memory: "50Mi"
# builder_pod_node_selector: "disk:ssd"
# git_lock_timeout: 10 # number of minutes you want to wait to git push again to the same repository (default 10)

global:
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
# Experimental feature to toggle using kubernetes ingress instead of the Hephy router.
#
# Valid values are:
# - true: The deis controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
# - false: The default mode, and the default behavior of Deis workflow.
experimental_native_ingress: false
# - true: The hephy controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
# - false: The default mode, and the default behavior of Hephy workflow.
use_native_ingress: false
# Role-Based Access Control for Kubernetes >= 1.5
use_rbac: false
3 changes: 2 additions & 1 deletion workflow/charts/controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ description: Hephy Workflow Controller (API).
home: https://github.com/teamhephy/controller
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: controller
version: v2.23.0
version: 2.22.3
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rules:
- apiGroups: ["extensions", "autoscaling"]
resources: ["horizontalpodautoscalers"]
verbs: ["get", "list", "create", "update", "delete"]
{{ if .Values.global.experimental_native_ingress }}
{{ if .Values.global.use_native_ingress }}
- apiGroups: ["networking.k8s.io"]
resources: ["ingresses"]
verbs: ["get", "list", "watch", "create", "update", "delete"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ spec:
# NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
- name: "DEIS_REGISTRY_SERVICE_HOST"
value: "127.0.0.1"
# Environmental variable value for $EXPERIMENTAL_NATIVE_INGRESS
- name: "EXPERIMENTAL_NATIVE_INGRESS"
value: "{{ .Values.global.experimental_native_ingress }}"
- name: "EXPERIMENTAL_NATIVE_INGRESS_HOSTNAME"
# Environmental variable value for $NATIVE_INGRESS
- name: "NATIVE_INGRESS"
value: "{{ .Values.global.use_native_ingress }}"
- name: "NATIVE_INGRESS_HOSTNAME"
value: "{{ .Values.platform_domain }}"
- name: "K8S_API_VERIFY_TLS"
value: "{{ .Values.k8s_api_verify_tls }}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Values.global.experimental_native_ingress }}
{{ if .Values.global.use_native_ingress }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down
8 changes: 4 additions & 4 deletions workflow/charts/controller/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org: "hephy"
pull_policy: "IfNotPresent"
docker_tag: v2.22.0 # FIXME - the real v2.23.0 controller will have...
app_pull_policy: "IfNotPresent"
docker_tag: v2.22.0
app_pull_policy: "Always"
# A comma-separated list of URLs to send app release information to
# See https://deis.com/docs/workflow/managing-workflow/deploy-hooks
deploy_hook_urls: ""
Expand Down Expand Up @@ -66,11 +66,11 @@ global:
# - 600
# - "None"
# conn_max_age: 600
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
# Feature to toggle using kubernetes ingress instead of the Deis router.
#
# Valid values are:
# - true: The deis controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
# - false: The default mode, and the default behavior of Deis workflow.
experimental_native_ingress: false
use_native_ingress: false
# Role-Based Access Control for Kubernetes >= 1.5
use_rbac: false
4 changes: 3 additions & 1 deletion workflow/charts/database/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
apiVersion: v2
description: A PostgreSQL database used by Hephy Workflow.
home: https://github.com/teamhephy/postgres
keywords:
- database
- postgres
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: database
version: v2.7.6
version: 2.7.8
4 changes: 3 additions & 1 deletion workflow/charts/dockerbuilder/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
apiVersion: v2
description: Hephy dockerbuilder builds your app from a Dockerfile inside a Kubernetes
pod, used by Hephy Workflow.
home: https://github.com/teamhephy/dockerbuilder
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: dockerbuilder
version: v2.8.3
version: 2.8.5
4 changes: 3 additions & 1 deletion workflow/charts/fluentd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
description: Log shipping mechanism for Hephy Workflow.
home: https://github.com/teamhephy/fluentd
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: fluentd
version: v2.15.1
version: 2.15.3
4 changes: 3 additions & 1 deletion workflow/charts/logger/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
description: In-memory log buffer used by Hephy Workflow.
home: https://github.com/teamhephy/logger
maintainers:
- email: team@teamhephy.com
name: Team Hephy
name: logger
version: v2.5.1
version: 2.5.3
Loading

0 comments on commit b4256e2

Please sign in to comment.