Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Connect server to v1.1.0 #40

Merged
merged 6 commits into from
Apr 29, 2021
Merged

Update Connect server to v1.1.0 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a2f1e8
Update Connect server to v1.1.0
florisvdg Apr 29, 2021
830c3af
Remove redundant version pin from default values.yaml
florisvdg Apr 29, 2021
428f325
Update README with new default
florisvdg Apr 29, 2021
2857245
Explicitly set Chart AppVersion as default value
florisvdg Apr 29, 2021
f11b760
Move tpl note to top of values.yaml file
florisvdg Apr 29, 2021
57fd9b8
Format YAML
florisvdg Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion connect/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ maintainers:
- name: 1Password Secrets Integrations Team
email: support+business@1password.com
icon: https://avatars.githubusercontent.com/u/38230737
appVersion: "1.0.0"
appVersion: "1.1.0"
2 changes: 1 addition & 1 deletion connect/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ $ helm install --set connect.applicationName=connect connect ./connect
| connect.sync.imageRepository | string | `"1password/connect-sync` | The 1Password Connect Sync repository |
| connect.sync.name | string | `"connect-sync"` | The name of the 1Password Connect Sync container |
| connect.sync.resources | object | `{}` | The resources requests/limits for the 1Password Connect Sync pod |
| connect.version | string | `"0.3"` | The 1Password Connect version to pull |
| connect.version | string | `{{ .Chart.AppVersion }}` | The 1Password Connect version to pull |
| operator.autoRestart | boolean | `false` | Denotes whether the 1Password Connect Operator will automatically restart deployments based on associated updated secrets. |
| operator.create | boolean | `false` | Denotes whether the 1Password Connect Operator will be deployed |
| operator.imagePullPolicy | string | `"IfNotPresent` | The 1Password Connect Operator image pull policy |
Expand Down
6 changes: 3 additions & 3 deletions connect/templates/connect-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
metadata:
labels:
app: {{ .Values.connect.applicationName }}
version: "{{ .Values.connect.version }}"
version: "{{ tpl .Values.connect.version . }}"
spec:
{{- with .Values.connect.nodeSelector }}
nodeSelector:
Expand All @@ -38,7 +38,7 @@ spec:
name: {{ .Values.connect.dataVolume.name }}
containers:
- name: {{ .Values.connect.api.name }}
image: {{ .Values.connect.api.imageRepository }}:{{ .Values.connect.version | default .Chart.AppVersion }}
image: {{ .Values.connect.api.imageRepository }}:{{ tpl .Values.connect.version . }}
imagePullPolicy: {{ .Values.connect.imagePullPolicy }}
securityContext:
runAsUser: 999
Expand All @@ -63,7 +63,7 @@ spec:
- mountPath: /home/opuser/.op/data
name: {{ .Values.connect.dataVolume.name }}
- name: connect-sync
image: {{ .Values.connect.sync.imageRepository }}:{{ .Values.connect.version | default .Chart.AppVersion }}
image: {{ .Values.connect.sync.imageRepository }}:{{ tpl .Values.connect.version . }}
imagePullPolicy: {{ .Values.connect.imagePullPolicy }}
securityContext:
runAsUser: 999
Expand Down
14 changes: 9 additions & 5 deletions connect/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Note: values.yaml files don't support templating out of the box, so that means
# that every value "{{ .Between.Curly.Braces }}" in this file needs to be
# explicitly interpolated on the template side by using the `tpl` function.

connect:
applicationName: onepassword-connect
api:
Expand All @@ -16,7 +20,7 @@ connect:
type: emptyDir
values: {}
imagePullPolicy: IfNotPresent
version: "1.0.0"
version: "{{ .Chart.AppVersion }}"
nodeSelector: {}

operator:
Expand All @@ -29,23 +33,23 @@ operator:
version: "1.0.0"
nodeSelector: {}
watchNamespace:
- "{{ .Release.Namespace }}" # This will be interpolated in the templates, using the tpl function
- "{{ .Release.Namespace }}"
token:
name: onepassword-token
key: token
value:

serviceAccount:
create: "{{ .Values.operator.create }}" # This will be interpolated in the templates, using the tpl function
create: "{{ .Values.operator.create }}"
annotations: {}
name: onepassword-connect-operator

roleBinding:
create: "{{ .Values.operator.create }}" # This will be interpolated in the templates, using the tpl function
create: "{{ .Values.operator.create }}"
name: onepassword-connect-operator

clusterRole:
create: "{{ .Values.operator.create }}" # This will be interpolated in the templates, using the tpl function
create: "{{ .Values.operator.create }}"
name: onepassword-connect-operator

service:
Expand Down