Skip to content

Commit

Permalink
Merge pull request #10 from aserto-dev/pull-secrets
Browse files Browse the repository at this point in the history
Fix default value for aserto-lib.imagePullSecrets
  • Loading branch information
ronenh authored Aug 30, 2024
2 parents 1f6b5fb + 69614e7 commit 6626e89
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 44 deletions.
2 changes: 1 addition & 1 deletion charts/aserto-lib/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: library
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.2
version: 0.1.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
5 changes: 4 additions & 1 deletion charts/aserto-lib/templates/_image.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{{- define "aserto-lib.imagePullSecrets" -}}
{{- with $secrets := .Values.imagePullSecrets | default ((.Values.global).aserto).imagePullSecrets | default list "ghcr-creds" }}
{{- with $secrets :=
.Values.imagePullSecrets |
default ((.Values.global).aserto).imagePullSecrets |
default (list (dict "name" "ghcr-creds")) -}}
{{- if $secrets }}
imagePullSecrets:
{{- toYaml $secrets | nindent 2 }}
Expand Down
14 changes: 7 additions & 7 deletions charts/aserto/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
dependencies:
- name: directory
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.4
version: 0.1.5
- name: authorizer
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.4
version: 0.1.5
- name: discovery
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.3
version: 0.1.4
- name: console
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.3
version: 0.1.4
- name: scim
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.2
digest: sha256:77d07e379dc437b1d45b3933a509285a9d99e1f21579966b208aa7718d62a678
generated: "2024-08-29T17:47:03.459519-04:00"
version: 0.1.3
digest: sha256:52549edf4d65b54d9aecfd26cd19974b0606f06a034ff3ac0574e9fea58670a3
generated: "2024-08-30T07:51:19.880893-04:00"
12 changes: 6 additions & 6 deletions charts/aserto/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.5
version: 0.1.6

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -30,17 +30,17 @@ appVersion: "0.1.0"

dependencies:
- name: directory
version: ~0.1.4
version: ~0.1.5
repository: oci://ghcr.io/aserto-dev/helm
- name: authorizer
version: ~0.1.4
version: ~0.1.5
repository: oci://ghcr.io/aserto-dev/helm
- name: discovery
version: ~0.1.3
version: ~0.1.4
repository: oci://ghcr.io/aserto-dev/helm
- name: console
version: ~0.1.3
version: ~0.1.4
repository: oci://ghcr.io/aserto-dev/helm
- name: scim
version: ~0.1.2
version: ~0.1.3
repository: oci://ghcr.io/aserto-dev/helm
6 changes: 3 additions & 3 deletions charts/authorizer/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: aserto-lib
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.2
digest: sha256:88930f2dcace90dff2c804a9d0fb8e8bfc0bb2d0f93734c103cc6a39a9286914
generated: "2024-08-29T16:47:26.68983-04:00"
version: 0.1.3
digest: sha256:ce25ed7c67b00cdfb3d17ddb8bc80146ba94f6a6ebdb1c7a7004ee67fcee4bac
generated: "2024-08-30T07:36:53.544524-04:00"
4 changes: 2 additions & 2 deletions charts/authorizer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.4
version: 0.1.5

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -30,5 +30,5 @@ appVersion: "0.14.8"

dependencies:
- name: aserto-lib
version: ~0.1.2
version: ~0.1.3
repository: oci://ghcr.io/aserto-dev/helm
6 changes: 3 additions & 3 deletions charts/console/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: aserto-lib
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.2
digest: sha256:88930f2dcace90dff2c804a9d0fb8e8bfc0bb2d0f93734c103cc6a39a9286914
generated: "2024-08-29T16:47:30.472459-04:00"
version: 0.1.3
digest: sha256:ce25ed7c67b00cdfb3d17ddb8bc80146ba94f6a6ebdb1c7a7004ee67fcee4bac
generated: "2024-08-30T07:36:57.247407-04:00"
4 changes: 2 additions & 2 deletions charts/console/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.3
version: 0.1.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -30,5 +30,5 @@ appVersion: "0.1.13"

dependencies:
- name: aserto-lib
version: ~0.1.2
version: ~0.1.3
repository: oci://ghcr.io/aserto-dev/helm
6 changes: 3 additions & 3 deletions charts/directory/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: aserto-lib
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.2
digest: sha256:88930f2dcace90dff2c804a9d0fb8e8bfc0bb2d0f93734c103cc6a39a9286914
generated: "2024-08-29T16:47:34.013265-04:00"
version: 0.1.3
digest: sha256:ce25ed7c67b00cdfb3d17ddb8bc80146ba94f6a6ebdb1c7a7004ee67fcee4bac
generated: "2024-08-30T08:15:56.64798-04:00"
4 changes: 2 additions & 2 deletions charts/directory/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.4
version: 0.1.5

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -30,5 +30,5 @@ appVersion: "0.32.10"

dependencies:
- name: aserto-lib
version: ~0.1.2
version: ~0.1.3
repository: oci://ghcr.io/aserto-dev/helm
4 changes: 4 additions & 0 deletions charts/directory/ci/test-values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
global:
aserto:
imagePullSecrets:
- name: ghcr-creds
rootDirectory:
tenantID: root-tenant-id
database:
Expand Down
6 changes: 3 additions & 3 deletions charts/discovery/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: aserto-lib
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.2
digest: sha256:88930f2dcace90dff2c804a9d0fb8e8bfc0bb2d0f93734c103cc6a39a9286914
generated: "2024-08-29T17:45:29.05777-04:00"
version: 0.1.3
digest: sha256:ce25ed7c67b00cdfb3d17ddb8bc80146ba94f6a6ebdb1c7a7004ee67fcee4bac
generated: "2024-08-30T07:37:04.499003-04:00"
4 changes: 2 additions & 2 deletions charts/discovery/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.3
version: 0.1.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -30,5 +30,5 @@ appVersion: "0.1.3"

dependencies:
- name: aserto-lib
version: ~0.1.2
version: ~0.1.3
repository: oci://ghcr.io/aserto-dev/helm
6 changes: 3 additions & 3 deletions charts/scim/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: aserto-lib
repository: oci://ghcr.io/aserto-dev/helm
version: 0.1.2
digest: sha256:88930f2dcace90dff2c804a9d0fb8e8bfc0bb2d0f93734c103cc6a39a9286914
generated: "2024-08-29T16:47:41.185025-04:00"
version: 0.1.3
digest: sha256:ce25ed7c67b00cdfb3d17ddb8bc80146ba94f6a6ebdb1c7a7004ee67fcee4bac
generated: "2024-08-30T07:37:08.212356-04:00"
4 changes: 2 additions & 2 deletions charts/scim/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.2
version: 0.1.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -30,5 +30,5 @@ appVersion: "0.0.7"

dependencies:
- name: aserto-lib
version: ~0.1.2
version: ~0.1.3
repository: oci://ghcr.io/aserto-dev/helm
5 changes: 1 addition & 4 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,7 @@ push-%:
release-%: update-% build-% package-% push-%;

.PHONY: bump-%
bump-%: bump-chart-%

.PHONY: bump-chart-%
bump-chart-%:
bump-%:
@echo -e "${ATTN_COLOR}==> bump ${BUMP_PART} $* (${CHART_VERSION}) ${NO_COLOR}"
@bumpversion --no-tag --no-commit --allow-dirty --current-version ${CHART_VERSION} \
${BUMP_PART} ${CHARTS_DIR}/$*/Chart.yaml
Expand Down

0 comments on commit 6626e89

Please sign in to comment.