Skip to content

Commit b4256e2

Browse files
author
Kingdon Barrett
authored
Merge pull request #2 from kingdonb/test-release
WIP: Test release
2 parents 0a2dc99 + 4b83d23 commit b4256e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+231
-205
lines changed

‎clones/.gitignore

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
builder/
2+
controller/
3+
dockerbuilder/
4+
fluentd/
5+
logger/
6+
minio/
7+
monitor/
8+
nsqd/
9+
postgres/
10+
redis/
11+
registry/
12+
registry-proxy/
13+
registry-token-refresher/
14+
router/
15+
slugbuilder/
16+
slugrunner/
17+
workflow/
18+
workflow-manager/

‎repositories.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
archetype:
2+
- builder
3+
repos:
4+
- workflow
5+
- controller
6+
- slugbuilder
7+
- dockerbuilder
8+
- slugrunner
9+
- postgres
10+
- fluentd
11+
- redis
12+
- logger
13+
- minio
14+
- monitor
15+
- nsqd
16+
- registry
17+
- registry-proxy
18+
- registry-token-refresher
19+
- router
20+
- workflow-manager

‎workflow/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
charts/*.tgz
2+
Chart.lock

‎workflow/Chart.lock

-54
This file was deleted.

‎workflow/Chart.yaml

+54-53
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
apiVersion: v2
2+
dependencies:
3+
- name: builder
4+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
5+
version: 2.13.10
6+
- name: slugbuilder
7+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
8+
version: 2.8.2
9+
- name: dockerbuilder
10+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
11+
version: 2.8.5
12+
- name: controller
13+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
14+
version: 2.22.3
15+
- name: slugrunner
16+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
17+
version: 2.7.2
18+
- name: database
19+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
20+
version: 2.7.8
21+
- name: fluentd
22+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
23+
version: 2.15.3
24+
- name: redis
25+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
26+
version: 2.4.5
27+
- name: logger
28+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
29+
version: 2.5.3
30+
- name: minio
31+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
32+
version: 2.4.7
33+
- name: monitor
34+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
35+
version: 2.11.6
36+
- name: nsqd
37+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
38+
version: 2.5.4
39+
- name: registry
40+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
41+
version: 2.6.3
42+
- name: registry-proxy
43+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
44+
version: 1.5.3
45+
- name: registry-token-refresher
46+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
47+
version: 1.2.4
48+
- name: router
49+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
50+
version: 2.19.4
51+
- name: workflow-manager
52+
repository: oci://ghcr.io/kingdonb/hephy-workflow-beta
53+
version: 2.6.4
254
description: Hephy Workflow
355
home: https://github.com/teamhephy/workflow
456
maintainers:
557
- email: team@teamhephy.com
58+
name: Team Hephy
659
name: workflow
7-
version: 2.24.0-beta.3
8-
dependencies:
9-
- name: builder
10-
version: "2.13.7"
11-
repository: https://charts.teamhephy.com
12-
- name: slugbuilder
13-
version: "2.8.0"
14-
repository: https://charts.teamhephy.com
15-
- name: dockerbuilder
16-
version: "2.8.3"
17-
repository: https://charts.teamhephy.com
18-
- name: controller
19-
version: "2.23.0"
20-
repository: https://charts-beta.hephy.pro
21-
- name: slugrunner
22-
version: "2.7.0"
23-
repository: https://charts.teamhephy.com
24-
- name: database
25-
version: "2.7.6"
26-
repository: https://charts.teamhephy.com
27-
- name: fluentd
28-
version: "2.15.1"
29-
repository: https://charts.teamhephy.com
30-
- name: redis
31-
version: "2.4.2"
32-
repository: https://charts.teamhephy.com
33-
- name: logger
34-
version: "2.5.1"
35-
repository: https://charts.teamhephy.com
36-
- name: minio
37-
version: "2.4.5"
38-
repository: https://charts.teamhephy.com
39-
- name: monitor
40-
version: "2.11.2"
41-
repository: https://charts.teamhephy.com
42-
- name: nsqd
43-
version: "2.5.1"
44-
repository: https://charts.teamhephy.com
45-
- name: registry
46-
version: "2.6.1"
47-
repository: https://charts.teamhephy.com
48-
- name: registry-proxy
49-
version: "v1.5.1"
50-
repository: https://charts.teamhephy.com
51-
- name: registry-token-refresher
52-
version: "v1.2.2"
53-
repository: https://charts.teamhephy.com
54-
- name: router
55-
version: "2.19.0"
56-
repository: https://charts.teamhephy.com
57-
- name: workflow-manager
58-
version: "2.6.2"
59-
repository: https://charts.teamhephy.com
60+
version: 2.24.0-beta.6

‎workflow/changelog-v2.23.0.md

-27
This file was deleted.

‎workflow/charts/builder/Chart.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
apiVersion: v2
12
description: Git server and application builder for Hephy Workflow.
23
home: https://github.com/teamhephy/builder
34
maintainers:
45
- email: team@teamhephy.com
6+
name: Team Hephy
57
name: builder
6-
version: v2.13.7
8+
version: 2.13.10

‎workflow/charts/builder/templates/builder-service.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ metadata:
44
name: deis-builder
55
labels:
66
heritage: deis
7+
annotations:
8+
{{- if .Values.global.use_native_ingress }}
9+
external-dns.alpha.kubernetes.io/hostname: deis-builder.{{ .Values.platform_domain }}
10+
{{- end }}
711
spec:
812
ports:
913
- name: ssh
1014
port: 2222
1115
targetPort: 2223
1216
selector:
1317
app: deis-builder
14-
{{ if .Values.global.experimental_native_ingress }}
18+
{{ if .Values.global.use_native_ingress }}
1519
type: "LoadBalancer"
1620
{{ end }}

‎workflow/charts/builder/values.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
org: "hephy"
2-
pull_policy: "IfNotPresent"
2+
pull_policy: "Always"
33
docker_tag: v2.13.7
44
# limits_cpu: "100m"
55
# limits_memory: "50Mi"
66
# builder_pod_node_selector: "disk:ssd"
77
# git_lock_timeout: 10 # number of minutes you want to wait to git push again to the same repository (default 10)
88

99
global:
10-
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
10+
# Experimental feature to toggle using kubernetes ingress instead of the Hephy router.
1111
#
1212
# Valid values are:
13-
# - true: The deis controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
14-
# - false: The default mode, and the default behavior of Deis workflow.
15-
experimental_native_ingress: false
13+
# - true: The hephy controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
14+
# - false: The default mode, and the default behavior of Hephy workflow.
15+
use_native_ingress: false
1616
# Role-Based Access Control for Kubernetes >= 1.5
1717
use_rbac: false

‎workflow/charts/controller/Chart.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ description: Hephy Workflow Controller (API).
33
home: https://github.com/teamhephy/controller
44
maintainers:
55
- email: team@teamhephy.com
6+
name: Team Hephy
67
name: controller
7-
version: v2.23.0
8+
version: 2.22.3

‎workflow/charts/controller/templates/controller-clusterrole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rules:
5050
- apiGroups: ["extensions", "autoscaling"]
5151
resources: ["horizontalpodautoscalers"]
5252
verbs: ["get", "list", "create", "update", "delete"]
53-
{{ if .Values.global.experimental_native_ingress }}
53+
{{ if .Values.global.use_native_ingress }}
5454
- apiGroups: ["networking.k8s.io"]
5555
resources: ["ingresses"]
5656
verbs: ["get", "list", "watch", "create", "update", "delete"]

‎workflow/charts/controller/templates/controller-deployment.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ spec:
5858
# NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
5959
- name: "DEIS_REGISTRY_SERVICE_HOST"
6060
value: "127.0.0.1"
61-
# Environmental variable value for $EXPERIMENTAL_NATIVE_INGRESS
62-
- name: "EXPERIMENTAL_NATIVE_INGRESS"
63-
value: "{{ .Values.global.experimental_native_ingress }}"
64-
- name: "EXPERIMENTAL_NATIVE_INGRESS_HOSTNAME"
61+
# Environmental variable value for $NATIVE_INGRESS
62+
- name: "NATIVE_INGRESS"
63+
value: "{{ .Values.global.use_native_ingress }}"
64+
- name: "NATIVE_INGRESS_HOSTNAME"
6565
value: "{{ .Values.platform_domain }}"
6666
- name: "K8S_API_VERIFY_TLS"
6767
value: "{{ .Values.k8s_api_verify_tls }}"

‎workflow/charts/controller/templates/controller-ingress-rule-http-80.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ if .Values.global.experimental_native_ingress }}
1+
{{ if .Values.global.use_native_ingress }}
22
apiVersion: networking.k8s.io/v1
33
kind: Ingress
44
metadata:

‎workflow/charts/controller/values.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
org: "hephy"
22
pull_policy: "IfNotPresent"
3-
docker_tag: v2.22.0 # FIXME - the real v2.23.0 controller will have...
4-
app_pull_policy: "IfNotPresent"
3+
docker_tag: v2.22.0
4+
app_pull_policy: "Always"
55
# A comma-separated list of URLs to send app release information to
66
# See https://deis.com/docs/workflow/managing-workflow/deploy-hooks
77
deploy_hook_urls: ""
@@ -66,11 +66,11 @@ global:
6666
# - 600
6767
# - "None"
6868
# conn_max_age: 600
69-
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
69+
# Feature to toggle using kubernetes ingress instead of the Deis router.
7070
#
7171
# Valid values are:
7272
# - true: The deis controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
7373
# - false: The default mode, and the default behavior of Deis workflow.
74-
experimental_native_ingress: false
74+
use_native_ingress: false
7575
# Role-Based Access Control for Kubernetes >= 1.5
7676
use_rbac: false

‎workflow/charts/database/Chart.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
apiVersion: v2
12
description: A PostgreSQL database used by Hephy Workflow.
23
home: https://github.com/teamhephy/postgres
34
keywords:
45
- database
56
- postgres
67
maintainers:
78
- email: team@teamhephy.com
9+
name: Team Hephy
810
name: database
9-
version: v2.7.6
11+
version: 2.7.8

‎workflow/charts/dockerbuilder/Chart.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
apiVersion: v2
12
description: Hephy dockerbuilder builds your app from a Dockerfile inside a Kubernetes
23
pod, used by Hephy Workflow.
34
home: https://github.com/teamhephy/dockerbuilder
45
maintainers:
56
- email: team@teamhephy.com
7+
name: Team Hephy
68
name: dockerbuilder
7-
version: v2.8.3
9+
version: 2.8.5

‎workflow/charts/fluentd/Chart.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
apiVersion: v2
12
description: Log shipping mechanism for Hephy Workflow.
23
home: https://github.com/teamhephy/fluentd
34
maintainers:
45
- email: team@teamhephy.com
6+
name: Team Hephy
57
name: fluentd
6-
version: v2.15.1
8+
version: 2.15.3

‎workflow/charts/logger/Chart.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
apiVersion: v2
12
description: In-memory log buffer used by Hephy Workflow.
23
home: https://github.com/teamhephy/logger
34
maintainers:
45
- email: team@teamhephy.com
6+
name: Team Hephy
57
name: logger
6-
version: v2.5.1
8+
version: 2.5.3

0 commit comments

Comments
 (0)