Skip to content

Commit 0c639d9

Browse files
scott-cottonscott-cotton
authored
Merge pull request #102 from signadot/release-v1.2.0
Release v1.2.0
2 parents 1d901b7 + f8df0fb commit 0c639d9

65 files changed

Lines changed: 1191 additions & 1698 deletions

File tree

Some content is hidden

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

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
name: Release Charts
22

3+
# This workflow creates a new chart release when changes are merged to the release branch.
4+
# The release branch should only receive changes through pull requests from main.
5+
# Each merge commit to release represents a deliberate release decision.
6+
37
on:
48
push:
59
branches:
6-
- main
10+
- release
11+
workflow_dispatch:
12+
# Allow manual trigger for releases
713

814
jobs:
915
release:

‎signadot/operator/Chart.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ type: application
66
# This is the chart version. This version number should be incremented each time you make changes
77
# to the chart and its templates, including the app version.
88
# Versions are expected to follow Semantic Versioning (https://semver.org/)
9-
version: "1.0.0"
9+
version: "1.2.0"
10+
1011

1112
# This is the version number of the application being deployed. This version number should be
1213
# incremented each time you make changes to the application. Versions are not expected to
1314
# follow Semantic Versioning. They should reflect the version the application is using.
1415
# It is recommended to use it with quotes.
15-
appVersion: "1.0.0"
16+
17+
appVersion: "1.2.0"
18+

‎signadot/operator/README.md‎

Lines changed: 114 additions & 120 deletions
Large diffs are not rendered by default.

‎signadot/operator/templates/NOTES.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{{ if not .Values.disableAgent }}
2-
2+
{{- if and (hasKey .Values "controlPlane") (hasKey .Values.controlPlane "clusterToken") }}
3+
Please visit https://app.signadot.com to verify that your cluster has been
4+
successfully registered.
5+
{{- else }}
36
Please visit https://app.signadot.com to register this cluster and create a cluster token.
47

58
Then populate the cluster token in a Secret by running the following command
69
with "..." replaced by the token value.
710

8-
kubectl -n signadot create secret generic cluster-agent --from-literal=token=...
9-
11+
kubectl -n signadot create secret generic cluster-token --from-literal=token=...
12+
{{- end }}
1013
{{ end }}

‎signadot/operator/templates/_helpers.tpl‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,30 @@ cluster config template
55
{{- define "compileClusterConfig" -}}
66
{{- $allowedNamespaces := (include "getAllowedNamespaces" . | fromJsonArray) -}}
77
allowedNamespaces: {{ if gt (len $allowedNamespaces) 0 }}{{ printf "\n" }}{{ toYaml $allowedNamespaces | indent 2}}{{- else -}}[]{{- end }}
8+
{{- if (hasKey .Values "controlPlane") }}
89
controlPlane:
9-
proxy: {{ if and (hasKey .Values "controlPlane") (hasKey .Values.controlPlane "proxy") -}}{{ .Values.controlPlane.proxy }}{{- else -}}enabled{{- end }}
10+
{{- if (hasKey .Values.controlPlane "proxy") }}
11+
proxy: {{ .Values.controlPlane.proxy }}
12+
{{- end }}
13+
{{- if (hasKey .Values.controlPlane "controlAPI") }}
14+
controlAPI: {{ .Values.controlPlane.controlAPI }}
15+
{{- end }}
16+
{{- if (hasKey .Values.controlPlane "tunnelAddr") }}
17+
tunnelAddr: {{ .Values.controlPlane.tunnelAddr }}
18+
{{- end }}
19+
{{- if (hasKey .Values.controlPlane "tunnelTLS") }}
20+
tunnelTLS: {{ .Values.controlPlane.tunnelTLS }}
21+
{{- end }}
22+
{{- if (hasKey .Values.controlPlane "proxyURL") }}
23+
proxyURL: {{ .Values.controlPlane.proxyURL }}
24+
{{- end }}
25+
{{- if (hasKey .Values.controlPlane "artifactsAPI") }}
26+
artifactsAPI: {{ .Values.controlPlane.artifactsAPI }}
27+
{{- end }}
28+
{{- if (hasKey .Values.controlPlane "trafficmodelsAPI") }}
29+
trafficmodelsAPI: {{ .Values.controlPlane.trafficmodelsAPI }}
30+
{{- end }}
31+
{{- end }}
1032
allowOrphanedResources: {{ if hasKey .Values "allowOrphanedResources" -}}{{ toString .Values.allowOrphanedResources }}{{- else -}}false{{- end }}
1133
routing:
1234
istio:
@@ -26,8 +48,8 @@ routing:
2648
{{- end}}
2749
iptablesMode: {{ if and (hasKey .Values "routing") (hasKey .Values.routing "iptablesMode") -}}{{ .Values.routing.iptablesMode }}{{- else -}}legacy{{- end }}
2850
customHeaders: {{ with .Values }}{{ with .routing }}{{ with .customHeaders }}{{ printf "\n" }}{{ toYaml . | indent 4}}{{- else -}}[]{{- end }}{{- else -}}[]{{- end }}{{- else -}}[]{{- end }}
29-
sandboxTrafficManager:
30-
enabled: {{ if and (hasKey .Values "sandboxTrafficManager") (hasKey .Values.sandboxTrafficManager "enabled") -}}{{ toString .Values.sandboxTrafficManager.enabled }}{{- else -}}true{{- end }}
51+
trafficManager:
52+
enabled: {{ if and (hasKey .Values "trafficManager") (hasKey .Values.trafficManager "enabled") -}}{{ toString .Values.trafficManager.enabled }}{{- else -}}true{{- end }}
3153
trafficCapture:
3254
enabled: {{ if and (hasKey .Values "trafficCapture") (hasKey .Values.trafficCapture "enabled") -}}{{ toString .Values.trafficCapture.enabled }}{{- else -}}true{{- end }}
3355
requestHeadersElide: {{ with .Values }}{{ with .trafficCapture }}{{ with .requestHeadersElide }}{{ printf "\n" }}{{ toYaml . | indent 4}}{{- else -}}[]{{- end }}{{- else -}}[]{{- end }}{{- else -}}[]{{- end }}

‎signadot/operator/templates/agent-deployment.yaml‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ spec:
2727
template:
2828
metadata:
2929
annotations:
30+
cluster-config-checksum: '{{ include (print $.Template.BasePath "/cluster-config-configmap.yaml")
31+
. | sha256sum }}'
3032
{{- range $key, $val := .Values.commonAnnotations }}
3133
{{ $key | quote }}: {{ $val | quote }}
3234
{{- end }}
3335
{{- range $key, $val := .Values.podAnnotations }}
3436
{{ $key | quote }}: {{ $val | quote }}
3537
{{- end }}
36-
cluster-config-checksum: '{{ include (print $.Template.BasePath "/signadot-cluster-config-configmap.yaml")
37-
. | sha256sum }}'
3838
{{- if $linkerdEnabled }}
3939
{{- if and (hasKey .Values.linkerd "operator") (hasKey .Values.linkerd.operator "podAnnotations") (.Values.linkerd.operator.podAnnotations)}}
4040
{{- range $key, $val := .Values.linkerd.operator.podAnnotations }}
@@ -63,16 +63,7 @@ spec:
6363
{{- end }}
6464
spec:
6565
containers:
66-
- args:
67-
- --api-url=https://api.signadot.com
68-
- --tunnel-addr=tunnel.signadot.com:443
69-
env:
70-
- name: AGENT_TOKEN
71-
valueFrom:
72-
secretKeyRef:
73-
key: token
74-
name: cluster-agent
75-
image: {{ with .Values }}{{ with .agent }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/agent:v1.0.0{{- end }}{{- else -}}signadot/agent:v1.0.0{{- end }}{{- else -}}signadot/agent:v1.0.0{{- end }}
66+
- image: {{ with .Values }}{{ with .agent }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/agent:v1.2.0{{- end }}{{- else -}}signadot/agent:v1.2.0{{- end }}{{- else -}}signadot/agent:v1.2.0{{- end }}
7667
imagePullPolicy: {{ with .Values }}{{ with .agent }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
7768
livenessProbe:
7869
httpGet:
@@ -89,5 +80,29 @@ spec:
8980
resources:
9081
{{ toYaml . | indent 10 }}
9182
{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
83+
volumeMounts:
84+
- mountPath: /etc/signadot/
85+
name: signadot-config
86+
readOnly: true
9287
serviceAccountName: agent
88+
volumes:
89+
- name: signadot-config
90+
projected:
91+
sources:
92+
- secret:
93+
items:
94+
- key: token
95+
path: token
96+
name: '{{ $oldSecret := (lookup "v1" "Secret" "signadot" "cluster-agent")
97+
}} {{- with .Values }} {{- with .controlPlane }} {{- with .tokenSecret
98+
}} {{- . }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
99+
}} {{- else }}cluster-token {{- end }} {{- end }} {{- else }} {{-
100+
if $oldSecret }}{{- $oldSecret.metadata.name }} {{- else }}cluster-token
101+
{{- end }} {{- end }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
102+
}} {{- else }}cluster-token {{- end }} {{- end }}'
103+
- configMap:
104+
items:
105+
- key: cluster_config.yaml
106+
path: cluster_config.yaml
107+
name: cluster-config
93108
{{ end }}

signadot/operator/templates/signadot-cluster-config-configmap.yaml renamed to signadot/operator/templates/cluster-config-configmap.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
}}
44
{{ fail "istio and linkerd cannot be enabled at the same time" }}
55
{{- end }}
6+
{{- if and (hasKey .Values "istio") (hasKey .Values.istio "enableDeprecatedHostRouting") }}
7+
{{ fail "istio host routing is no longer supported" }}
8+
{{- end }}
69

710
apiVersion: v1
811
kind: ConfigMap
912
metadata:
10-
name: signadot-cluster-config
13+
name: cluster-config
1114
namespace: signadot
1215
data:
1316
cluster_config.yaml: |
14-
{{- include "compileClusterConfig" . | nindent 4 }}
17+
{{- include "compileClusterConfig" . | nindent 4 }}

‎signadot/operator/templates/cluster-token-secret.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{- if and (hasKey .Values "controlPlane") (hasKey .Values.controlPlane "clusterToken")
2+
}}
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: {{ with .Values }}{{ with .controlPlane }}{{ with .tokenSecret }}{{ . }}{{- else -}}"cluster-token"{{- end }}{{- else -}}"cluster-token"{{- end }}{{- else -}}"cluster-token"{{- end }}
7+
namespace: signadot
8+
data:
9+
token: {{ .Values.controlPlane.clusterToken | b64enc | quote }}
10+
{{- end }}

‎signadot/operator/templates/forkedworkloads.signadot.com-customresourcedefinition.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ spec:
7272
- name
7373
type: object
7474
disableSandboxTrafficManager:
75+
description: 'DEPRECATED: this field is no longer needed.'
7576
type: boolean
7677
patches:
7778
description: List of patches to be applied to the baseline workload

‎signadot/operator/templates/io-context-server-deployment.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ metadata:
1313
name: io-context-server
1414
namespace: signadot
1515
spec:
16-
replicas: 1
16+
{{- with .Values }}{{- with .ioContextServer }}{{- with .replicas }}
17+
replicas: {{ . }}
18+
{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
1719
selector:
1820
matchLabels:
1921
app: io-context-server
@@ -40,7 +42,7 @@ spec:
4042
- /app/io-context-server
4143
- -tls=secretns=signadot
4244
- -port=8443
43-
image: {{ with .Values }}{{ with .ioContextServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-context-server:v1.0.0{{- end }}{{- else -}}signadot/io-context-server:v1.0.0{{- end }}{{- else -}}signadot/io-context-server:v1.0.0{{- end }}
45+
image: {{ with .Values }}{{ with .ioContextServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-context-server:v1.2.0{{- end }}{{- else -}}signadot/io-context-server:v1.2.0{{- end }}{{- else -}}signadot/io-context-server:v1.2.0{{- end }}
4446
imagePullPolicy: {{ with .Values }}{{ with .ioContextServer }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
4547
name: io-context-server
4648
ports:

0 commit comments

Comments
 (0)