diff --git a/clones/.gitignore b/clones/.gitignore new file mode 100644 index 0000000..ca64d88 --- /dev/null +++ b/clones/.gitignore @@ -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/ diff --git a/repositories.yaml b/repositories.yaml new file mode 100644 index 0000000..1937943 --- /dev/null +++ b/repositories.yaml @@ -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 diff --git a/workflow/.gitignore b/workflow/.gitignore new file mode 100644 index 0000000..9169e44 --- /dev/null +++ b/workflow/.gitignore @@ -0,0 +1,2 @@ +charts/*.tgz +Chart.lock diff --git a/workflow/Chart.lock b/workflow/Chart.lock deleted file mode 100644 index f66e718..0000000 --- a/workflow/Chart.lock +++ /dev/null @@ -1,54 +0,0 @@ -dependencies: -- name: builder - repository: https://charts.teamhephy.com - version: v2.13.7 -- name: slugbuilder - repository: https://charts.teamhephy.com - version: v2.8.0 -- name: dockerbuilder - repository: https://charts.teamhephy.com - version: v2.8.3 -- name: controller - repository: https://charts-beta.hephy.pro - version: v2.23.0 -- name: slugrunner - repository: https://charts.teamhephy.com - version: v2.7.0 -- name: database - repository: https://charts.teamhephy.com - version: v2.7.6 -- name: fluentd - repository: https://charts.teamhephy.com - version: v2.15.1 -- name: redis - repository: https://charts.teamhephy.com - version: v2.4.2 -- name: logger - repository: https://charts.teamhephy.com - version: v2.5.1 -- name: minio - repository: https://charts.teamhephy.com - version: v2.4.5 -- name: monitor - repository: https://charts.teamhephy.com - version: v2.11.2 -- name: nsqd - repository: https://charts.teamhephy.com - version: v2.5.1 -- name: registry - repository: https://charts.teamhephy.com - version: v2.6.1 -- name: registry-proxy - repository: https://charts.teamhephy.com - version: v1.5.1 -- name: registry-token-refresher - repository: https://charts.teamhephy.com - version: v1.2.2 -- name: router - repository: https://charts.teamhephy.com - version: v2.19.0 -- name: workflow-manager - repository: https://charts.teamhephy.com - version: v2.6.2 -digest: sha256:5d5f1715c581179ee4da2fd0523ccc4d2e9beba742ce1bae5946e50ed0239065 -generated: "2021-12-29T05:54:26.401112-05:00" diff --git a/workflow/Chart.yaml b/workflow/Chart.yaml index ca02e76..6b69a50 100644 --- a/workflow/Chart.yaml +++ b/workflow/Chart.yaml @@ -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 diff --git a/workflow/changelog-v2.23.0.md b/workflow/changelog-v2.23.0.md deleted file mode 100644 index 308a08a..0000000 --- a/workflow/changelog-v2.23.0.md +++ /dev/null @@ -1,27 +0,0 @@ - -#### Releases - -- controller v2.21.3 -> v2.22.0 -- router v2.18.1 -> v2.19.0 -- slugbuilder v2.7.8 -> v2.8.0 -- slugrunner v2.6.3 -> v2.7.0 -- workflow v2.22.3 -> v2.23.0 -- workflow-cli v2.22.3 -> v2.23.0 -- workflow-e2e v2.22.3 -> v2.23.0 - -#### Features - -- [`fa49020`](https://github.com/teamhephy/controller/commit/fa490205416a400453621d0606c139b6e4033d97) (controller) - django: upgrade django framework and deps -- [`73ecafb`](https://github.com/teamhephy/slugbuilder/commit/73ecafb92bbf705994433c72b84895ddc6ebffba) (slugbuilder) - slugbuilder: update stack to heroku-20-build -- [`4e3bac5`](https://github.com/teamhephy/slugrunner/commit/4e3bac588a5413da50e01df1c8026c376027bed1) (slugrunner) - slugrunner: update stack to heroku-20 - -#### Documentation - -- [`91c72ff`](https://github.com/teamhephy/workflow/commit/91c72ffa39bf8d32c1b81d8c5396236478918e83) (workflow) - README: fix year 2021 for v2.22.3 - -#### Maintenance - -- [`ace34f8`](https://github.com/teamhephy/controller/commit/ace34f887a6eae9ce933b7bcafa60260f75b6217) (controller) - django: upgrade django to >= 2.2.20 -- [`713ad1d`](https://github.com/teamhephy/router/commit/713ad1ddca06b2c8bc0d355fdef43b3d515cc1ed) (router) - charts: regenerate dhparams for router -- [`199cfd8`](https://github.com/teamhephy/router/commit/199cfd86e4a37eef8ce9153fc99e00036da33687) (router) - rootfs: upgrade to openssl 1.1.1k -- [`0ec588b`](https://github.com/teamhephy/slugbuilder/commit/0ec588bbc3eecab32a06e47265217cdfb4001814) (slugbuilder) - buildpacks: update all buildpacks to latest diff --git a/workflow/charts/builder/Chart.yaml b/workflow/charts/builder/Chart.yaml index 2dc9e4c..bafb214 100644 --- a/workflow/charts/builder/Chart.yaml +++ b/workflow/charts/builder/Chart.yaml @@ -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 diff --git a/workflow/charts/builder/templates/builder-service.yaml b/workflow/charts/builder/templates/builder-service.yaml index c4fad80..2c3d5aa 100644 --- a/workflow/charts/builder/templates/builder-service.yaml +++ b/workflow/charts/builder/templates/builder-service.yaml @@ -4,6 +4,10 @@ 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 @@ -11,6 +15,6 @@ spec: targetPort: 2223 selector: app: deis-builder -{{ if .Values.global.experimental_native_ingress }} +{{ if .Values.global.use_native_ingress }} type: "LoadBalancer" {{ end }} diff --git a/workflow/charts/builder/values.yaml b/workflow/charts/builder/values.yaml index a35b05b..f16afc5 100644 --- a/workflow/charts/builder/values.yaml +++ b/workflow/charts/builder/values.yaml @@ -1,5 +1,5 @@ org: "hephy" -pull_policy: "IfNotPresent" +pull_policy: "Always" docker_tag: v2.13.7 # limits_cpu: "100m" # limits_memory: "50Mi" @@ -7,11 +7,11 @@ docker_tag: v2.13.7 # 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 diff --git a/workflow/charts/controller/Chart.yaml b/workflow/charts/controller/Chart.yaml index 2d4d9eb..95e0fff 100644 --- a/workflow/charts/controller/Chart.yaml +++ b/workflow/charts/controller/Chart.yaml @@ -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 diff --git a/workflow/charts/controller/templates/controller-clusterrole.yaml b/workflow/charts/controller/templates/controller-clusterrole.yaml index 7bffa2c..0145cf2 100644 --- a/workflow/charts/controller/templates/controller-clusterrole.yaml +++ b/workflow/charts/controller/templates/controller-clusterrole.yaml @@ -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"] diff --git a/workflow/charts/controller/templates/controller-deployment.yaml b/workflow/charts/controller/templates/controller-deployment.yaml index 83368e4..86c1999 100644 --- a/workflow/charts/controller/templates/controller-deployment.yaml +++ b/workflow/charts/controller/templates/controller-deployment.yaml @@ -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 }}" diff --git a/workflow/charts/controller/templates/controller-ingress-rule-http-80.yaml b/workflow/charts/controller/templates/controller-ingress-rule-http-80.yaml index 7cfba85..27229aa 100644 --- a/workflow/charts/controller/templates/controller-ingress-rule-http-80.yaml +++ b/workflow/charts/controller/templates/controller-ingress-rule-http-80.yaml @@ -1,4 +1,4 @@ -{{ if .Values.global.experimental_native_ingress }} +{{ if .Values.global.use_native_ingress }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/workflow/charts/controller/values.yaml b/workflow/charts/controller/values.yaml index d6d13cf..beab6fe 100644 --- a/workflow/charts/controller/values.yaml +++ b/workflow/charts/controller/values.yaml @@ -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: "" @@ -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 diff --git a/workflow/charts/database/Chart.yaml b/workflow/charts/database/Chart.yaml index 0f5aea6..733fb09 100644 --- a/workflow/charts/database/Chart.yaml +++ b/workflow/charts/database/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v2 description: A PostgreSQL database used by Hephy Workflow. home: https://github.com/teamhephy/postgres keywords: @@ -5,5 +6,6 @@ keywords: - postgres maintainers: - email: team@teamhephy.com + name: Team Hephy name: database -version: v2.7.6 +version: 2.7.8 diff --git a/workflow/charts/dockerbuilder/Chart.yaml b/workflow/charts/dockerbuilder/Chart.yaml index 89910a8..0becc7b 100644 --- a/workflow/charts/dockerbuilder/Chart.yaml +++ b/workflow/charts/dockerbuilder/Chart.yaml @@ -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 diff --git a/workflow/charts/fluentd/Chart.yaml b/workflow/charts/fluentd/Chart.yaml index 5b745cd..96122ae 100644 --- a/workflow/charts/fluentd/Chart.yaml +++ b/workflow/charts/fluentd/Chart.yaml @@ -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 diff --git a/workflow/charts/logger/Chart.yaml b/workflow/charts/logger/Chart.yaml index c083683..107c91e 100644 --- a/workflow/charts/logger/Chart.yaml +++ b/workflow/charts/logger/Chart.yaml @@ -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 diff --git a/workflow/charts/minio/Chart.yaml b/workflow/charts/minio/Chart.yaml index 5ab5eab..a515d3f 100644 --- a/workflow/charts/minio/Chart.yaml +++ b/workflow/charts/minio/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Minio Object Storage in Kubernetes, used by Hephy Workflow. home: https://github.com/teamhephy/minio maintainers: - email: team@teamhephy.com + name: Team Hephy name: minio -version: v2.4.5 +version: 2.4.7 diff --git a/workflow/charts/monitor/Chart.yaml b/workflow/charts/monitor/Chart.yaml index 2ba6050..93b13b3 100644 --- a/workflow/charts/monitor/Chart.yaml +++ b/workflow/charts/monitor/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Monitoring for Hephy Workflow. home: https://github.com/teamhephy/monitor maintainers: - email: team@teamhephy.com + name: Team Hephy name: monitor -version: v2.11.2 +version: 2.11.6 diff --git a/workflow/charts/monitor/charts/grafana/Chart.yaml b/workflow/charts/monitor/charts/grafana/Chart.yaml index e381f6b..55a25bb 100644 --- a/workflow/charts/monitor/charts/grafana/Chart.yaml +++ b/workflow/charts/monitor/charts/grafana/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Monitoring for Hephy Workflow. home: https://github.com/teamhephy/monitor/tree/master/grafana maintainers: - email: team@teamhephy.com + name: Team Hephy name: grafana -version: v2.11.2 +version: 2.11.6 diff --git a/workflow/charts/monitor/charts/influxdb/Chart.yaml b/workflow/charts/monitor/charts/influxdb/Chart.yaml index f8eb771..f85fc14 100644 --- a/workflow/charts/monitor/charts/influxdb/Chart.yaml +++ b/workflow/charts/monitor/charts/influxdb/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Monitoring for Hephy Workflow. home: https://github.com/teamhephy/monitor/tree/master/influxdb maintainers: - email: team@teamhephy.com + name: Team Hephy name: influxdb -version: v2.11.2 +version: 2.11.6 diff --git a/workflow/charts/monitor/charts/telegraf/Chart.yaml b/workflow/charts/monitor/charts/telegraf/Chart.yaml index 9bd7dd8..2c920f6 100644 --- a/workflow/charts/monitor/charts/telegraf/Chart.yaml +++ b/workflow/charts/monitor/charts/telegraf/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Monitoring for Hephy Workflow. home: https://github.com/teamhephy/monitor/tree/master/telegraf maintainers: - email: team@teamhephy.com + name: Team Hephy name: telegraf -version: v2.11.2 +version: 2.11.6 diff --git a/workflow/charts/monitor/templates/_helpers.tmpl b/workflow/charts/monitor/templates/_helpers.tmpl index 422a5ae..cf80f4c 100644 --- a/workflow/charts/monitor/templates/_helpers.tmpl +++ b/workflow/charts/monitor/templates/_helpers.tmpl @@ -10,3 +10,12 @@ rbac.authorization.k8s.io/v1alpha1 rbac.authorization.k8s.io/v1 {{- end -}} {{- end -}} +{{- define "APIVersion" -}} +{{- if .Capabilities.APIVersions.Has "apps/v1" -}} +apps/v1 +{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}} +extensions/v1beta1 +{{- else -}} +apps/v1 +{{- end -}} +{{- end -}} diff --git a/workflow/charts/nsqd/Chart.yaml b/workflow/charts/nsqd/Chart.yaml index 0ef936c..7906190 100644 --- a/workflow/charts/nsqd/Chart.yaml +++ b/workflow/charts/nsqd/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: A kubernetes based docker image for running nsq daemon. -home: https://github.com/teamhephy/nsqd +home: https://github.com/teamhephy/nsq maintainers: - email: team@teamhephy.com + name: Team Hephy name: nsqd -version: v2.5.1 +version: 2.5.4 diff --git a/workflow/charts/nsqd/values.yaml b/workflow/charts/nsqd/values.yaml index 9e92bcb..2756baf 100644 --- a/workflow/charts/nsqd/values.yaml +++ b/workflow/charts/nsqd/values.yaml @@ -1,6 +1,6 @@ org: "hephy" pull_policy: "IfNotPresent" -docker_tag: "v2.5.1" +docker_tag: v2.5.1 # limits_cpu: "100m" # limits_memory: "50Mi" replicas: 1 diff --git a/workflow/charts/redis/Chart.yaml b/workflow/charts/redis/Chart.yaml index 79e7c37..9e78258 100644 --- a/workflow/charts/redis/Chart.yaml +++ b/workflow/charts/redis/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: A Redis database for use inside a Kubernetes cluster. home: https://github.com/teamhephy/redis maintainers: - email: team@teamhephy.com + name: Team Hephy name: redis -version: v2.4.2 +version: 2.4.5 diff --git a/workflow/charts/redis/templates/logger-redis-service.yaml b/workflow/charts/redis/templates/logger-redis-service.yaml index 8c5c72e..9b56201 100644 --- a/workflow/charts/redis/templates/logger-redis-service.yaml +++ b/workflow/charts/redis/templates/logger-redis-service.yaml @@ -9,5 +9,5 @@ spec: selector: app: deis-logger-redis ports: - - port: 6379 + - port: {{.Values.port}} {{- end }} diff --git a/workflow/charts/redis/templates/logger-redis-deployment.yaml b/workflow/charts/redis/templates/logger-redis-statefulset.yaml similarity index 84% rename from workflow/charts/redis/templates/logger-redis-deployment.yaml rename to workflow/charts/redis/templates/logger-redis-statefulset.yaml index 5c3be62..1bc3094 100644 --- a/workflow/charts/redis/templates/logger-redis-deployment.yaml +++ b/workflow/charts/redis/templates/logger-redis-statefulset.yaml @@ -1,6 +1,6 @@ {{- if eq .Values.global.logger_redis_location "on-cluster" }} apiVersion: {{ template "APIVersion" . }} -kind: Deployment +kind: StatefulSet metadata: name: deis-logger-redis labels: @@ -8,9 +8,8 @@ metadata: annotations: component.deis.io/version: {{ .Values.docker_tag }} spec: - replicas: 1 - strategy: - type: Recreate + serviceName: deis-logger-redis + replicas: {{ .Values.replicas }} selector: matchLabels: app: deis-logger-redis @@ -33,8 +32,9 @@ spec: memory: {{.Values.limits_memory}} {{- end}} {{- end}} + command: ["/bin/boot", "--port", "{{.Values.port}}"] ports: - - containerPort: 6379 + - containerPort: {{.Values.port}} volumeMounts: - name: logger-redis-creds mountPath: /var/run/secrets/deis/redis/creds diff --git a/workflow/charts/redis/values.yaml b/workflow/charts/redis/values.yaml index f730c6c..8e5c71e 100644 --- a/workflow/charts/redis/values.yaml +++ b/workflow/charts/redis/values.yaml @@ -12,8 +12,10 @@ global: # - off-cluster: Run Redis outside the Kubernetes cluster (configure in loggerRedis section) logger_redis_location: "on-cluster" -# Configure the following ONLY if using an off-cluster Redis instance for logger -db: "0" -host: "redis host" -port: "redis port" +# The following parameters are configured only when using an on-cluster Redis instance for logger +replicas: 1 +port: "6379" + +# The following parameters are configured only when using an off-cluster Redis instance for logger +addrs: "" # A list of clusters: "127.0.0.1:7001/1,127.0.0.2:7002/1" password: "redis password" # "" == no password diff --git a/workflow/charts/registry-proxy/Chart.yaml b/workflow/charts/registry-proxy/Chart.yaml index c892865..8075611 100644 --- a/workflow/charts/registry-proxy/Chart.yaml +++ b/workflow/charts/registry-proxy/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Hephy Workflow Registry Proxy. home: https://github.com/teamhephy/registry-proxy maintainers: - email: team@teamhephy.com + name: Team Hephy name: registry-proxy -version: v1.5.1 +version: 1.5.3 diff --git a/workflow/charts/registry-token-refresher/Chart.yaml b/workflow/charts/registry-token-refresher/Chart.yaml index 8bfaa1c..cfea734 100644 --- a/workflow/charts/registry-token-refresher/Chart.yaml +++ b/workflow/charts/registry-token-refresher/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v2 description: Token Refresher for Hephy Workflow. home: https://github.com/teamhephy/registry-token-refresher keywords: @@ -5,5 +6,6 @@ keywords: - token refresher maintainers: - email: team@teamhephy.com + name: Team Hephy name: registry-token-refresher -version: v1.2.2 +version: 1.2.4 diff --git a/workflow/charts/registry/Chart.yaml b/workflow/charts/registry/Chart.yaml index 0572e83..ff32d3e 100644 --- a/workflow/charts/registry/Chart.yaml +++ b/workflow/charts/registry/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Docker registry for Hephy Workflow. home: https://github.com/teamhephy/registry maintainers: - email: team@teamhephy.com + name: Team Hephy name: registry -version: v2.6.1 +version: 2.6.3 diff --git a/workflow/charts/router/Chart.yaml b/workflow/charts/router/Chart.yaml index bed15b8..b1c2939 100644 --- a/workflow/charts/router/Chart.yaml +++ b/workflow/charts/router/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Edge router for Hephy Workflow. home: https://github.com/teamhephy/router maintainers: - email: team@teamhephy.com + name: Team Hephy name: router -version: v2.19.0 +version: 2.19.4 diff --git a/workflow/charts/router/templates/router-deployment.yaml b/workflow/charts/router/templates/router-deployment.yaml index 407f561..37cb7c2 100644 --- a/workflow/charts/router/templates/router-deployment.yaml +++ b/workflow/charts/router/templates/router-deployment.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: {{ template "APIVersion" . }} kind: Deployment metadata: @@ -60,6 +60,14 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace +{{- if (.Values.rate_limit.qps) }} + - name: RATE_LIMIT_QPS + value: {{.Values.rate_limit.qps}} +{{- end}} +{{- if (.Values.rate_limit.burst) }} + - name: RATE_LIMIT_BURST + value: {{.Values.rate_limit.burst}} +{{- end}} ports: - containerPort: 8080 {{- if .Values.host_port.enabled }} @@ -89,4 +97,4 @@ spec: port: 9090 initialDelaySeconds: 1 timeoutSeconds: 1 -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/workflow/charts/router/templates/router-dhparam-secret.yaml b/workflow/charts/router/templates/router-dhparam-secret.yaml index 703dae0..d53db74 100644 --- a/workflow/charts/router/templates/router-dhparam-secret.yaml +++ b/workflow/charts/router/templates/router-dhparam-secret.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: v1 kind: Secret metadata: @@ -8,4 +8,4 @@ metadata: type: Opaque data: dhparam: {{ if not (empty .Values.dhparam) }}{{ .Values.dhparam }}{{ else }}LS0tLS1CRUdJTiBESCBQQVJBTUVURVJTLS0tLS0KTUlJQ0NBS0NBZ0VBMTV6UHBQcElsaTYyUC9aTHFUcHhYdnNHMUtZU2hnbzJUOFpFZ1VzM0NxTjZiSU4xSHU1VwpXNnNVdDRYWXpJNExkSWxRanlFOHZjeWhxdEl6ajIyM1hLalhXQVE1WU5ud2NZU05jVUlyTjh1YThQN2ZmNlF2CnhiWlFMbjRUY1k3N2VWMm1Ecm9MSU5TUlFzZFZGVlpiRUpmK1lOZEFOa2w4dlg5UDlIelVrdm5SaGI5cDJJOXEKWGY5dll1cEVVbXd1K1I2d2pzNnFzUTJ4akVmTGxmcnczaEdrUi9jdjBtT2QvUmVrWWRjbVlISjlUelpkM3NSZgp6cTl3ckw0RWRDNzBUSmNQcERZZXRaWUdKV3Fxa3hpKzM4eGtuV2dtNkN0cE1TdEFHMk5UVWJ2ZmRoTGpid2tmCmU4a2o4M01HalZ5ajNlTktTd0VQYlo5bXJWTFR3VWh6WkQ2bFV3eG1rQ1ZBVXl2MEZmb3BhT29PSXJuNnRUaVIKRWhmdkxZVXQvWkVZK2hPOWpFalp6alAvbEcrOFFpZWpFaW16bjFIbkt4S041WE55bkRraUxwR3p4TjNBK2RreAo0NUpuUGZDODZVTS9ZRnpRVy9zdWszTUhLTk5MSVRtVXNHZzRiTTdSYWNCT29OTm94S0hYTTI5aUE4UU9YRytBCnF2eW4wQ2lNbWN4K0NvSTN2anN2NW83Yk5OU2xvWEtCUlExMFY4VVlXZDd4eENzeDc4cTFLMHRHQUhnZWE0eEoKTW1FRGpRN2I4UXEzZC94Y05EM05ja0JGbU1VbnRVSjlUTHJSYU9WM0V2bDVYcG1JMnl1ZENHVXRuUVhleVgyRApRSHFyOEtiQmJNMGZkUFg4dUJJWVNFL0U4NVYzT294eUJ2UFJLRzRtdUN5OVp1QWFjb0Z5aG1NQ0FRST0KLS0tLS1FTkQgREggUEFSQU1FVEVSUy0tLS0tCg=={{ end }} -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/workflow/charts/router/templates/router-service-account.yaml b/workflow/charts/router/templates/router-service-account.yaml index 5fa7a12..f4f2cb9 100644 --- a/workflow/charts/router/templates/router-service-account.yaml +++ b/workflow/charts/router/templates/router-service-account.yaml @@ -1,8 +1,8 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: v1 kind: ServiceAccount metadata: name: deis-router labels: heritage: deis -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/workflow/charts/router/templates/router-service.yaml b/workflow/charts/router/templates/router-service.yaml index 23463b9..6b7cc26 100644 --- a/workflow/charts/router/templates/router-service.yaml +++ b/workflow/charts/router/templates/router-service.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: v1 kind: Service metadata: @@ -27,4 +27,4 @@ spec: - name: healthz port: 9090 targetPort: 9090 -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/workflow/charts/router/values.yaml b/workflow/charts/router/values.yaml index 3056ad6..92cf15e 100644 --- a/workflow/charts/router/values.yaml +++ b/workflow/charts/router/values.yaml @@ -7,8 +7,11 @@ dhparam: "" # limits_memory: "50Mi" # requests_cpu: "100m" # requests_memory: "50Mi" +rate_limit: {} +# qps: "50.0" +# burst: "50" -# Any custom router annotations(https://github.com/deis/router#annotations) +# Any custom router annotations(https://github.com/teamhephy/router#annotations) # which need to be applied can be specified as key-value pairs under "deployment_annotations" #deployment_annotations: #: @@ -31,6 +34,6 @@ global: # Valid values are: # - true: The Deis router will NOT be deployed. Inherently workflow will not be usable until a Kubernetes ingress controller is installed. # - 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 diff --git a/workflow/charts/slugbuilder/Chart.yaml b/workflow/charts/slugbuilder/Chart.yaml index f7bd5ec..8fdc76c 100644 --- a/workflow/charts/slugbuilder/Chart.yaml +++ b/workflow/charts/slugbuilder/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Buildpack application builder for Hephy Workflow. home: https://github.com/teamhephy/slugbuilder maintainers: - email: team@teamhephy.com + name: Team Hephy name: slugbuilder -version: v2.8.0 +version: 2.8.2 diff --git a/workflow/charts/slugrunner/Chart.yaml b/workflow/charts/slugrunner/Chart.yaml index d4d5fcc..3a4f0c6 100644 --- a/workflow/charts/slugrunner/Chart.yaml +++ b/workflow/charts/slugrunner/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: Buildpack application runner for Hephy Workflow. home: https://github.com/teamhephy/slugrunner maintainers: - email: team@teamhephy.com + name: Team Hephy name: slugrunner -version: v2.7.0 +version: 2.7.2 diff --git a/workflow/charts/workflow-manager/Chart.yaml b/workflow/charts/workflow-manager/Chart.yaml index f1a68be..ef36ba0 100644 --- a/workflow/charts/workflow-manager/Chart.yaml +++ b/workflow/charts/workflow-manager/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 description: 'Hephy Workflow Manager: Cluster First Aid' home: https://github.com/teamhephy/workflow-manager maintainers: - email: team@teamhephy.com + name: Team Hephy name: workflow-manager -version: v2.6.2 +version: 2.6.4 diff --git a/workflow/charts/workflow-manager/values.yaml b/workflow/charts/workflow-manager/values.yaml index 669bd46..0cbbcd1 100644 --- a/workflow/charts/workflow-manager/values.yaml +++ b/workflow/charts/workflow-manager/values.yaml @@ -1,7 +1,7 @@ org: "hephy" pull_policy: "IfNotPresent" docker_tag: v2.6.2 -versions_api_url: https://versions.teamhephy.info -doctor_api_url: https://doctor.teamhephy.info +versions_api_url: https://versions-staging.deis.com +doctor_api_url: https://doctor-staging.deis.com # limits_cpu: "100m" # limits_memory: "50Mi" diff --git a/workflow/templates/objectstorage-secret.yaml b/workflow/templates/objectstorage-secret.yaml index 0cc7b93..ce1a4fb 100644 --- a/workflow/templates/objectstorage-secret.yaml +++ b/workflow/templates/objectstorage-secret.yaml @@ -12,6 +12,7 @@ data: {{ if eq .Values.global.storage "gcs"}} builder-bucket: {{.Values.gcs.builder_bucket | b64enc }} registry-bucket: {{.Values.gcs.registry_bucket | b64enc }} database-bucket: {{.Values.gcs.database_bucket | b64enc }}{{ else if eq .Values.global.storage "azure"}} + azure-storage-conn-string: {{ .Values.azure.storage_conn_string | b64enc }} accountname: {{.Values.azure.accountname | b64enc }} accountkey: {{ .Values.azure.accountkey | b64enc }} builder-container: {{ .Values.azure.builder_container | b64enc }} diff --git a/workflow/values.yaml b/workflow/values.yaml index 72a75cf..f050191 100644 --- a/workflow/values.yaml +++ b/workflow/values.yaml @@ -51,12 +51,12 @@ global: host_port: 5555 # Prefix for the imagepull secret created when using private registry secret_prefix: "private-registry" - # Experimental feature to use Kubernetes ingress instead of Workflow's deis-router. + # Feature to use Kubernetes ingress instead of Workflow's deis-router. # # Valid values are: # - true: deis-router will not be deployed. Workflow will not be usable until a Kubernetes ingress controller is installed. # - false: deis-router will be deployed (default). - experimental_native_ingress: false + use_native_ingress: false # If the Kubernetes cluster uses CNI # use_cni: true # Set the `listen` variable for registry-proxy's NGINX @@ -89,12 +89,10 @@ s3: builder_bucket: "your-builder-bucket-name" azure: - # Starting with hephy v2.22.1 only AZURE_STORAGE_CONNECTION_STRING is - # necesssary for the postgres wal-e db blob backups and accountname and - # accountkey will not be used. - azure-storage-conn-string: "YOUR_AZURE_STORAGE_CONNECTION_STRING" + # We only support using accountname and accountkey currently for storage accountname: "YOUR ACCOUNT NAME" accountkey: "YOUR ACCOUNT KEY" + storage_conn_string: "YOUR_AZURE_STORAGE_CONNECTION_STRING" registry_container: "your-registry-container-name" database_container: "your-database-container-name" builder_container: "your-builder-container-name" @@ -138,6 +136,8 @@ controller: # # This will be the hostname that is used to build endpoints such as "deis.$HOSTNAME" platform_domain: "" + # Set a value for ingressClassName, if IngressClass is needed. + ingress_class: "" database: # The username and password to be used by the on-cluster database. @@ -152,12 +152,12 @@ database: host: "database host" port: "database port" -redis: +redis: {} # Configure the following ONLY if using an off-cluster Redis instance for logger - db: "0" - host: "redis host" - port: "redis port" - password: "redis password" # "" == no password + # db: "0" + # host: "redis host" + # port: "redis port" + # password: "redis password" # "" == no password fluentd: syslog: