Skip to content

Commit 8fd469b

Browse files
authored
Merge branch 'master' into ingress_api_version_k8s_122_support_issue_277
2 parents 6877f50 + 93afc57 commit 8fd469b

Some content is hidden

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

41 files changed

+758
-512
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
resource_class: large
5656
machine:
5757
# Available images https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
58-
image: ubuntu-1604:201903-01
58+
image: ubuntu-2204:2022.04.1
5959
steps:
6060
- checkout
6161
- kubernetes/install

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22

33
## In Development
4+
* Temporary workaround for #311 to use previous bitnami index from: https://github.com/bitnami/charts/issues/10539 (#312 #318) (by @0xhaven)
5+
* Refactor label definitions to be more consistent by building labels and label selectors in partial helper templates. (#299) (by @cognifloyd)
6+
7+
## v0.100.0
8+
* Switch st2 to `v3.7` as a new default stable version (#274)
9+
* Upgrade MongoDB `v4.0` -> `v4.4` as 4.0 has reached its EOL. (#304)
10+
* Migrate from `python 3.6` `Ubuntu Bionic` to `python 3.8` `Ubuntu Focal` as a base StackStorm OS (StackStorm/st2-dockerfiles#54)
11+
* Add support for use of overrides that are available in `v3.7` of st2 via helm charts. (#306)
412

513
## v0.90.0
614
* Advanced Feature: Make securityContext (on Deployments/Jobs) and podSecurityContext (on Pods) configurable. This allows dropping all capabilities, for example. You can override the securityContext for `st2actionrunner`, `st2sensorcontainer`, and `st2client` if your actions or sensors need, for example, additional capabilites that the rest of StackStorm does not need. (#271) (by @cognifloyd)

Chart.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
# StackStorm version which refers to Docker images tag
3-
appVersion: "3.6"
3+
appVersion: "3.7"
44
name: stackstorm-ha
5-
version: 0.90.0
5+
version: 0.100.0
66
description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment.
77
home: https://stackstorm.com/
88
icon: https://landscape.cncf.io/logos/stack-storm.svg
@@ -30,17 +30,17 @@ details:
3030
dependencies:
3131
- name: rabbitmq
3232
version: 8.0.2
33-
repository: https://charts.bitnami.com/bitnami
33+
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
3434
condition: rabbitmq.enabled
3535
- name: mongodb
3636
version: 10.0.1
37-
repository: https://charts.bitnami.com/bitnami
37+
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
3838
condition: mongodb.enabled
3939
- name: external-dns
4040
version: 4.0.0
41-
repository: https://charts.bitnami.com/bitnami
41+
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
4242
condition: external-dns.enabled
4343
- name: redis
4444
version: 12.3.2
45-
repository: https://charts.bitnami.com/bitnami
45+
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
4646
condition: redis.enabled

LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2018 The StackStorm Authors.
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

templates/_helpers.tpl

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,37 @@ Expand the name of the chart.
55
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
66
{{- end -}}
77

8+
{{/*
9+
Common labels
10+
Usage: "{{ include "stackstorm-ha.labels" (list $ "st2servicename") }}"
11+
*/}}
12+
{{- define "stackstorm-ha.labels" -}}
13+
{{- $root := index . 0 }}
14+
{{- $name := index . 1 }}
15+
{{ include "stackstorm-ha.selectorLabels" . }}
16+
{{- if list "st2web" "ingress" | has $name }}
17+
tier: frontend
18+
{{- else if eq $name "st2tests" }}
19+
tier: tests
20+
{{- else }}
21+
tier: backend
22+
{{- end }}
23+
vendor: stackstorm
24+
chart: {{ $root.Chart.Name }}-{{ $root.Chart.Version }}
25+
heritage: {{ $root.Release.Service }}
26+
{{- end -}}
27+
28+
{{/*
29+
Selector labels
30+
Usage: "{{ include "stackstorm-ha.selectorLabels" (list $ "st2servicename") }}"
31+
*/}}
32+
{{- define "stackstorm-ha.selectorLabels" -}}
33+
{{- $root := index . 0 }}
34+
{{- $name := index . 1 }}
35+
app: {{ $name }}
36+
release: {{ $root.Release.Name }}
37+
{{- end -}}
38+
839
{{/*
940
Generate Docker image repository: Public Docker Hub 'stackstorm' for FOSS version
1041
*/}}
@@ -210,6 +241,23 @@ define this here as well to simplify comparison with packs-volume-mounts
210241
{{- end }}
211242
{{- end -}}
212243

244+
#Inserted for override ability to happen via helm charts
245+
246+
{{- define "stackstorm-ha.overrides-config-mounts" -}}
247+
{{- if .Values.st2.overrides }}
248+
- name: st2-overrides-vol
249+
mountPath: /opt/stackstorm/overrides
250+
{{- end }}
251+
{{- end -}}
252+
253+
{{- define "stackstorm-ha.overrides-configs" -}}
254+
{{- if .Values.st2.overrides }}
255+
- name: st2-overrides-vol
256+
configMap:
257+
name: {{ .Release.Name }}-st2-overrides-configs
258+
{{- end }}
259+
{{- end -}}
260+
213261
{{/*
214262
For custom st2packs-initContainers reduce duplicity by defining them here once
215263
Merge packs and virtualenvs from st2 with those from st2packs images

templates/configmaps_overrides.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{- if .Values.st2.overrides }}
2+
---
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
name: {{ .Release.Name }}-st2-overrides-configs
7+
annotations:
8+
description: StackStorm override configs defined in helm values, shipped in (or copied to) '/opt/stackstorm/overrides'
9+
labels:
10+
app: st2
11+
tier: backend
12+
vendor: stackstorm
13+
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
14+
release: {{ .Release.Name }}
15+
heritage: {{ .Release.Service }}
16+
data:
17+
{{ toYaml .Values.st2.overrides | indent 2 }}
18+
{{- end }}

templates/configmaps_packs.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ metadata:
55
name: {{ .Release.Name }}-st2-pack-configs
66
annotations:
77
description: StackStorm pack configs defined in helm values, shipped in (or copied to) '/opt/stackstorm/configs/'
8-
labels:
9-
app: st2
10-
tier: backend
11-
vendor: stackstorm
12-
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
13-
release: {{ .Release.Name }}
14-
heritage: {{ .Release.Service }}
8+
labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
159
data:
1610
{{ toYaml .Values.st2.packs.configs | indent 2 }}

templates/configmaps_post-start-script.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@ metadata:
77
name: {{ $.Release.Name }}-{{ . }}-post-start-script
88
annotations:
99
description: Custom postStart lifecycle event handler script for {{ . }}
10-
labels:
11-
app: st2
12-
tier: backend
13-
vendor: stackstorm
14-
chart: {{ $.Chart.Name }}-{{ $.Chart.Version }}
15-
release: {{ $.Release.Name }}
16-
heritage: {{ $.Release.Service }}
10+
labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
1711
data:
1812
# k8s calls this script in parallel with starting {{ . }} (ie the same time as ENTRYPOINT)
1913
# The pod will not be marked as "running" until this script completes successfully.

0 commit comments

Comments
 (0)