Merge pull request #8 from aserto-dev/cicd

Add CI
aserto-dev · Aug 28, 2024 · 39ad4a1 · 39ad4a1
2 parents d4d4a87 + bb41974
commit 39ad4a1
Show file tree

Hide file tree

Showing 106 changed files with 131 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,50 @@
+name: ci
+
+on:
+  # Run on all PRs
+  pull_request:
+
+env:
+  HELM_VERSION: v3.14.4
+  PYTHON_VERSION: 3.x
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Read Configuration
+        uses: hashicorp/vault-action@v3
+        id: vault
+        with:
+          url: https://vault.eng.aserto.com/
+          token: ${{ secrets.VAULT_TOKEN }}
+          secrets: |
+            kv/data/github  "USERNAME"            | DOCKER_USERNAME;
+            kv/data/github  "READ_WRITE_TOKEN"    | READ_WRITE_TOKEN;
+      -
+        uses: actions/checkout@v4
+        with:
+          # Fetch the full history so that we can diff against the target branch
+          fetch-depth: 0
+      -
+        name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: ${{ env.HELM_VERSION }}
+      -
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          check-latest: true
+      -
+        name: Set up chart-testing
+        uses: helm/[email protected]
+        with:
+          version: v3.10.0
+      -
+        name: Lint ${{ matrix.chart.name }}
+        run: |
+          ct lint --config ct.yaml \
+            --target-branch ${{ github.event.repository.default_branch }} \
+            --helm-repo-extra-args "aserto-helm=-u gh -p ${READ_WRITE_TOKEN}"
diff --git a/aserto-lib/.helmignore → charts/aserto-lib/.helmignore b/aserto-lib/.helmignore → charts/aserto-lib/.helmignore
diff --git a/aserto-lib/Chart.yaml → charts/aserto-lib/Chart.yaml b/aserto-lib/Chart.yaml → charts/aserto-lib/Chart.yaml
@@ -1,6 +1,11 @@
 apiVersion: v2
 name: aserto-lib
 description: Common helpers for aserto charts
+icon: https://www.aserto.com/images/aserto-logo.png
+
+maintainers:
+  - name: Aserto
+    url: https://github.com/aserto-dev
 
 # A chart can be either an 'application' or a 'library' chart.
 #

diff --git a/charts/aserto-lib/build/aserto-lib-0.1.0.tgz b/charts/aserto-lib/build/aserto-lib-0.1.0.tgz
diff --git a/charts/aserto-lib/build/aserto-lib-0.1.1.tgz b/charts/aserto-lib/build/aserto-lib-0.1.1.tgz
diff --git a/aserto-lib/templates/_client.tpl → charts/aserto-lib/templates/_client.tpl b/aserto-lib/templates/_client.tpl → charts/aserto-lib/templates/_client.tpl
diff --git a/aserto-lib/templates/_clusteraddr.tpl → charts/aserto-lib/templates/_clusteraddr.tpl b/aserto-lib/templates/_clusteraddr.tpl → charts/aserto-lib/templates/_clusteraddr.tpl
diff --git a/aserto-lib/templates/_config.tpl → charts/aserto-lib/templates/_config.tpl b/aserto-lib/templates/_config.tpl → charts/aserto-lib/templates/_config.tpl
diff --git a/aserto-lib/templates/_global.tpl → charts/aserto-lib/templates/_global.tpl b/aserto-lib/templates/_global.tpl → charts/aserto-lib/templates/_global.tpl
diff --git a/aserto-lib/templates/_golangsvc.tpl → charts/aserto-lib/templates/_golangsvc.tpl b/aserto-lib/templates/_golangsvc.tpl → charts/aserto-lib/templates/_golangsvc.tpl
diff --git a/aserto-lib/templates/_image.tpl → charts/aserto-lib/templates/_image.tpl b/aserto-lib/templates/_image.tpl → charts/aserto-lib/templates/_image.tpl
diff --git a/aserto-lib/templates/_oidc.tpl → charts/aserto-lib/templates/_oidc.tpl b/aserto-lib/templates/_oidc.tpl → charts/aserto-lib/templates/_oidc.tpl
diff --git a/aserto-lib/templates/_ports.tpl → charts/aserto-lib/templates/_ports.tpl b/aserto-lib/templates/_ports.tpl → charts/aserto-lib/templates/_ports.tpl
diff --git a/charts/aserto-lib/values.yaml b/charts/aserto-lib/values.yaml
@@ -0,0 +1 @@
+# Library chart. No values
diff --git a/aserto/Chart.lock → charts/aserto/Chart.lock b/aserto/Chart.lock → charts/aserto/Chart.lock
diff --git a/aserto/Chart.yaml → charts/aserto/Chart.yaml b/aserto/Chart.yaml → charts/aserto/Chart.yaml
@@ -1,6 +1,11 @@
 apiVersion: v2
 name: aserto
 description: A Helm chart for Kubernetes
+icon: https://www.aserto.com/images/aserto-logo.png
+
+maintainers:
+  - name: Aserto
+    url: https://github.com/aserto-dev
 
 # A chart can be either an 'application' or a 'library' chart.
 #

diff --git a/charts/aserto/charts/authorizer-0.1.3.tgz b/charts/aserto/charts/authorizer-0.1.3.tgz
diff --git a/charts/aserto/charts/console-0.1.2.tgz b/charts/aserto/charts/console-0.1.2.tgz
diff --git a/charts/aserto/charts/directory-0.1.3.tgz b/charts/aserto/charts/directory-0.1.3.tgz
diff --git a/charts/aserto/charts/discovery-0.1.2.tgz b/charts/aserto/charts/discovery-0.1.2.tgz
diff --git a/charts/aserto/charts/scim-0.1.1.tgz b/charts/aserto/charts/scim-0.1.1.tgz
diff --git a/charts/aserto/ci/test-values.yaml b/charts/aserto/ci/test-values.yaml
@@ -0,0 +1,18 @@
+global:
+  aserto:
+    oidc:
+      domain: oidc_domain
+      audience: oidc_audience
+discovery:
+  registries:
+    ghcr.io:
+      scheme: bearer
+      tokenSecretName: ghcr-token-secret
+directory:
+  rootDirectory:
+    tenantID: root-tenant-id
+    database:
+      host: root-db-host
+  tenantDirectory:
+    database:
+      host: tenant-db-host
diff --git a/aserto/values.yaml → charts/aserto/values.yaml b/aserto/values.yaml → charts/aserto/values.yaml
diff --git a/authorizer/.helmignore → charts/authorizer/.helmignore b/authorizer/.helmignore → charts/authorizer/.helmignore
diff --git a/authorizer/Chart.lock → charts/authorizer/Chart.lock b/authorizer/Chart.lock → charts/authorizer/Chart.lock
diff --git a/authorizer/Chart.yaml → charts/authorizer/Chart.yaml b/authorizer/Chart.yaml → charts/authorizer/Chart.yaml
diff --git a/charts/authorizer/build/authorizer-0.1.3.tgz b/charts/authorizer/build/authorizer-0.1.3.tgz
diff --git a/charts/authorizer/charts/aserto-lib-0.1.1.tgz b/charts/authorizer/charts/aserto-lib-0.1.1.tgz
diff --git a/charts/authorizer/ci/test-values.yaml b/charts/authorizer/ci/test-values.yaml
@@ -0,0 +1,5 @@
+rootDirectory:
+  tenantID: root-tenant-id
+oidc:
+  domain: oidc_domain
+  audience: oidc_audience
diff --git a/authorizer/templates/NOTES.txt → charts/authorizer/templates/NOTES.txt b/authorizer/templates/NOTES.txt → charts/authorizer/templates/NOTES.txt
diff --git a/authorizer/templates/_helpers.tpl → charts/authorizer/templates/_helpers.tpl b/authorizer/templates/_helpers.tpl → charts/authorizer/templates/_helpers.tpl
diff --git a/authorizer/templates/api_keys.yaml → charts/authorizer/templates/api_keys.yaml b/authorizer/templates/api_keys.yaml → charts/authorizer/templates/api_keys.yaml
diff --git a/authorizer/templates/config.yaml → charts/authorizer/templates/config.yaml b/authorizer/templates/config.yaml → charts/authorizer/templates/config.yaml
diff --git a/authorizer/templates/deployment.yaml → charts/authorizer/templates/deployment.yaml b/authorizer/templates/deployment.yaml → charts/authorizer/templates/deployment.yaml
diff --git a/authorizer/templates/hpa.yaml → charts/authorizer/templates/hpa.yaml b/authorizer/templates/hpa.yaml → charts/authorizer/templates/hpa.yaml
diff --git a/authorizer/templates/ingress.yaml → charts/authorizer/templates/ingress.yaml b/authorizer/templates/ingress.yaml → charts/authorizer/templates/ingress.yaml
diff --git a/authorizer/templates/service.yaml → charts/authorizer/templates/service.yaml b/authorizer/templates/service.yaml → charts/authorizer/templates/service.yaml
diff --git a/authorizer/templates/serviceaccount.yaml → .../authorizer/templates/serviceaccount.yaml b/authorizer/templates/serviceaccount.yaml → .../authorizer/templates/serviceaccount.yaml
diff --git a/...izer/templates/tests/test-connection.yaml → ...izer/templates/tests/test-connection.yaml b/...izer/templates/tests/test-connection.yaml → ...izer/templates/tests/test-connection.yaml
diff --git a/authorizer/values.yaml → charts/authorizer/values.yaml b/authorizer/values.yaml → charts/authorizer/values.yaml
@@ -47,8 +47,6 @@ grpc:
 #   of type kubernetes.io/tls
 #   certSecret: directory-rest-cert
 
-
-
 # Disable authorization
 # noAuthorization: false
 

diff --git a/console/Chart.lock → charts/console/Chart.lock b/console/Chart.lock → charts/console/Chart.lock
diff --git a/console/Chart.yaml → charts/console/Chart.yaml b/console/Chart.yaml → charts/console/Chart.yaml
diff --git a/charts/console/build/console-0.1.0.tgz b/charts/console/build/console-0.1.0.tgz
diff --git a/charts/console/build/console-0.1.1.tgz b/charts/console/build/console-0.1.1.tgz
diff --git a/charts/console/build/console-0.1.2.tgz b/charts/console/build/console-0.1.2.tgz
diff --git a/charts/console/charts/aserto-lib-0.1.1.tgz b/charts/console/charts/aserto-lib-0.1.1.tgz
diff --git a/charts/console/ci/test-values.yaml b/charts/console/ci/test-values.yaml
@@ -0,0 +1,3 @@
+oidc:
+  domain: oidc_domain
+  audience: oidc_audience
diff --git a/console/templates/_helpers.tpl → charts/console/templates/_helpers.tpl b/console/templates/_helpers.tpl → charts/console/templates/_helpers.tpl
diff --git a/console/templates/deployment.yaml → charts/console/templates/deployment.yaml b/console/templates/deployment.yaml → charts/console/templates/deployment.yaml
diff --git a/console/templates/hpa.yaml → charts/console/templates/hpa.yaml b/console/templates/hpa.yaml → charts/console/templates/hpa.yaml
diff --git a/console/templates/ingress.yaml → charts/console/templates/ingress.yaml b/console/templates/ingress.yaml → charts/console/templates/ingress.yaml
diff --git a/console/templates/service.yaml → charts/console/templates/service.yaml b/console/templates/service.yaml → charts/console/templates/service.yaml
diff --git a/console/templates/serviceaccount.yaml → charts/console/templates/serviceaccount.yaml b/console/templates/serviceaccount.yaml → charts/console/templates/serviceaccount.yaml
diff --git a/console/values.yaml → charts/console/values.yaml b/console/values.yaml → charts/console/values.yaml
diff --git a/directory/.helmignore → charts/directory/.helmignore b/directory/.helmignore → charts/directory/.helmignore
diff --git a/directory/Chart.lock → charts/directory/Chart.lock b/directory/Chart.lock → charts/directory/Chart.lock
diff --git a/directory/Chart.yaml → charts/directory/Chart.yaml b/directory/Chart.yaml → charts/directory/Chart.yaml
diff --git a/charts/directory/build/directory-0.1.3.tgz b/charts/directory/build/directory-0.1.3.tgz
diff --git a/charts/directory/charts/aserto-lib-0.1.1.tgz b/charts/directory/charts/aserto-lib-0.1.1.tgz
diff --git a/charts/directory/ci/test-values.yaml b/charts/directory/ci/test-values.yaml
@@ -0,0 +1,7 @@
+rootDirectory:
+  tenantID: root-tenant-id
+  database:
+    host: root-db-host
+tenantDirectory:
+  database:
+    host: tenant-db-host
diff --git a/directory/templates/NOTES.txt → charts/directory/templates/NOTES.txt b/directory/templates/NOTES.txt → charts/directory/templates/NOTES.txt
diff --git a/directory/templates/_helpers.tpl → charts/directory/templates/_helpers.tpl b/directory/templates/_helpers.tpl → charts/directory/templates/_helpers.tpl
diff --git a/directory/templates/api_keys.yaml → charts/directory/templates/api_keys.yaml b/directory/templates/api_keys.yaml → charts/directory/templates/api_keys.yaml
diff --git a/directory/templates/config.yaml → charts/directory/templates/config.yaml b/directory/templates/config.yaml → charts/directory/templates/config.yaml
@@ -50,7 +50,7 @@ stringData:
     {{- with .Values.tenantDirectory.database -}}
     db:
       writer:
-        host: "{{ .host | required ".Values.tenantDirectory.host is required." }}"
+        host: "{{ .host | required ".Values.tenantDirectory.database.host is required." }}"
         port: {{ .port | default 5432 }}
         db_name: {{ .dbName | default "aserto-ds" }}
         ssl_mode: {{ .sslMode | default "require" }}
@@ -59,7 +59,7 @@ stringData:
         {{ toYaml .admin.options | nindent 8 }}
         {{ end }}
       reader:
-        host: "{{ .host | required ".Values.tenantDirectory.host is required." }}"
+        host: "{{ .host | required ".Values.tenantDirectory.database.host is required." }}"
         port: {{ .port | default 5432 }}
         db_name: {{ .dbName | default "aserto-ds" }}
         ssl_mode: {{ .sslMode | default "require" }}

diff --git a/directory/templates/db_credentials.yaml → ...s/directory/templates/db_credentials.yaml b/directory/templates/db_credentials.yaml → ...s/directory/templates/db_credentials.yaml
diff --git a/directory/templates/deployment.yaml → charts/directory/templates/deployment.yaml b/directory/templates/deployment.yaml → charts/directory/templates/deployment.yaml
diff --git a/directory/templates/hpa.yaml → charts/directory/templates/hpa.yaml b/directory/templates/hpa.yaml → charts/directory/templates/hpa.yaml
diff --git a/directory/templates/ingress.yaml → charts/directory/templates/ingress.yaml b/directory/templates/ingress.yaml → charts/directory/templates/ingress.yaml
diff --git a/directory/templates/service.yaml → charts/directory/templates/service.yaml b/directory/templates/service.yaml → charts/directory/templates/service.yaml
diff --git a/directory/templates/serviceaccount.yaml → ...s/directory/templates/serviceaccount.yaml b/directory/templates/serviceaccount.yaml → ...s/directory/templates/serviceaccount.yaml
diff --git a/...tory/templates/tests/test-connection.yaml → ...tory/templates/tests/test-connection.yaml b/...tory/templates/tests/test-connection.yaml → ...tory/templates/tests/test-connection.yaml
diff --git a/directory/values.yaml → charts/directory/values.yaml b/directory/values.yaml → charts/directory/values.yaml
diff --git a/discovery/Chart.lock → charts/discovery/Chart.lock b/discovery/Chart.lock → charts/discovery/Chart.lock
diff --git a/discovery/Chart.yaml → charts/discovery/Chart.yaml b/discovery/Chart.yaml → charts/discovery/Chart.yaml
diff --git a/charts/discovery/build/discovery-0.1.0.tgz b/charts/discovery/build/discovery-0.1.0.tgz
diff --git a/charts/discovery/build/discovery-0.1.1.tgz b/charts/discovery/build/discovery-0.1.1.tgz
diff --git a/charts/discovery/build/discovery-0.1.2.tgz b/charts/discovery/build/discovery-0.1.2.tgz
diff --git a/charts/discovery/charts/aserto-lib-0.1.1.tgz b/charts/discovery/charts/aserto-lib-0.1.1.tgz
diff --git a/charts/discovery/ci/test-values.yaml b/charts/discovery/ci/test-values.yaml
@@ -0,0 +1,9 @@
+oidc:
+  domain: oidc_domain
+  audience: oidc_audience
+rootDirectory:
+  tenantID: root-tenant-id
+registries:
+  ghcr.io:
+    scheme: bearer
+    tokenSecretName: ghcr-token-secret
diff --git a/discovery/templates/NOTES.txt → charts/discovery/templates/NOTES.txt b/discovery/templates/NOTES.txt → charts/discovery/templates/NOTES.txt
diff --git a/discovery/templates/_helpers.tpl → charts/discovery/templates/_helpers.tpl b/discovery/templates/_helpers.tpl → charts/discovery/templates/_helpers.tpl
diff --git a/discovery/templates/api_keys.yaml → charts/discovery/templates/api_keys.yaml b/discovery/templates/api_keys.yaml → charts/discovery/templates/api_keys.yaml
diff --git a/discovery/templates/config.yaml → charts/discovery/templates/config.yaml b/discovery/templates/config.yaml → charts/discovery/templates/config.yaml
diff --git a/discovery/templates/deployment.yaml → charts/discovery/templates/deployment.yaml b/discovery/templates/deployment.yaml → charts/discovery/templates/deployment.yaml
diff --git a/discovery/templates/hpa.yaml → charts/discovery/templates/hpa.yaml b/discovery/templates/hpa.yaml → charts/discovery/templates/hpa.yaml
diff --git a/discovery/templates/ingress.yaml → charts/discovery/templates/ingress.yaml b/discovery/templates/ingress.yaml → charts/discovery/templates/ingress.yaml
diff --git a/discovery/templates/service.yaml → charts/discovery/templates/service.yaml b/discovery/templates/service.yaml → charts/discovery/templates/service.yaml
diff --git a/discovery/templates/serviceaccount.yaml → ...s/discovery/templates/serviceaccount.yaml b/discovery/templates/serviceaccount.yaml → ...s/discovery/templates/serviceaccount.yaml
diff --git a/...very/templates/tests/test-connection.yaml → ...very/templates/tests/test-connection.yaml b/...very/templates/tests/test-connection.yaml → ...very/templates/tests/test-connection.yaml
diff --git a/discovery/values.yaml → charts/discovery/values.yaml b/discovery/values.yaml → charts/discovery/values.yaml
@@ -33,7 +33,7 @@ bundleDefaults:
 cacheSettings:
   type: "bigcache"
   cacheConfig:
-    ttl: 900000000000 # 15 minutes
+    ttl: 900000000000  # 15 minutes
 
 
 # Set the service log level (trace/debug/info/warn/error)

diff --git a/scim/Chart.lock → charts/scim/Chart.lock b/scim/Chart.lock → charts/scim/Chart.lock
diff --git a/scim/Chart.yaml → charts/scim/Chart.yaml b/scim/Chart.yaml → charts/scim/Chart.yaml
diff --git a/charts/scim/build/scim-0.1.1.tgz b/charts/scim/build/scim-0.1.1.tgz
diff --git a/charts/scim/charts/aserto-lib-0.1.1.tgz b/charts/scim/charts/aserto-lib-0.1.1.tgz
diff --git a/scim/templates/NOTES.txt → charts/scim/templates/NOTES.txt b/scim/templates/NOTES.txt → charts/scim/templates/NOTES.txt
diff --git a/scim/templates/_helpers.tpl → charts/scim/templates/_helpers.tpl b/scim/templates/_helpers.tpl → charts/scim/templates/_helpers.tpl
diff --git a/scim/templates/api_keys.yaml → charts/scim/templates/api_keys.yaml b/scim/templates/api_keys.yaml → charts/scim/templates/api_keys.yaml
diff --git a/scim/templates/config.yaml → charts/scim/templates/config.yaml b/scim/templates/config.yaml → charts/scim/templates/config.yaml
diff --git a/scim/templates/deployment.yaml → charts/scim/templates/deployment.yaml b/scim/templates/deployment.yaml → charts/scim/templates/deployment.yaml
diff --git a/scim/templates/hpa.yaml → charts/scim/templates/hpa.yaml b/scim/templates/hpa.yaml → charts/scim/templates/hpa.yaml
diff --git a/scim/templates/ingress.yaml → charts/scim/templates/ingress.yaml b/scim/templates/ingress.yaml → charts/scim/templates/ingress.yaml
diff --git a/scim/templates/service.yaml → charts/scim/templates/service.yaml b/scim/templates/service.yaml → charts/scim/templates/service.yaml
diff --git a/scim/templates/serviceaccount.yaml → charts/scim/templates/serviceaccount.yaml b/scim/templates/serviceaccount.yaml → charts/scim/templates/serviceaccount.yaml
diff --git a/scim/values.yaml → charts/scim/values.yaml b/scim/values.yaml → charts/scim/values.yaml
diff --git a/ct.yaml b/ct.yaml
@@ -0,0 +1,5 @@
+# See https://github.com/helm/chart-testing#configuration
+remote: origin
+target-branch: main
+chart-repos:
+  - aserto-helm=oci://ghcr.io/aserto-dev/helm
diff --git a/makefile b/makefile
@@ -11,33 +11,41 @@ CHART_REPO		:= "oci://ghcr.io/aserto-dev/helm"
 ifndef CHART
 $(error CHART must be set)
 endif
-CHART_VERSION   := $(shell cat $(CHART)/Chart.yaml | yq '.version')
+
+CHART_DIR		:= charts/${CHART}
+CHART_VERSION   := $(shell cat ${CHART_DIR}/Chart.yaml | yq '.version')
 
 .PHONY: clean
 clean:
-	@echo -e "$(ATTN_COLOR)==> clean $(CHART) $(NO_COLOR)"
-	@rm -rf $(CHART)/build
+	@echo -e "$(ATTN_COLOR)==> $@ ${CHART} $(NO_COLOR)"
+	@rm -rf ${CHART_DIR}/build
 
 .PHONY: update
 update:
-	@echo -e "$(ATTN_COLOR)==> update $(CHART) $(NO_COLOR)"
-	@helm dependency update $(CHART)
+	@echo -e "$(ATTN_COLOR)==> $@ ${CHART} $(NO_COLOR)"
+	@helm dependency update ${CHART_DIR}
 
 .PHONY: build
 build:
-	@echo -e "$(ATTN_COLOR)==> build $(CHART) $(NO_COLOR)"
-	@helm dependency build $(CHART)
+	@echo -e "$(ATTN_COLOR)==> $@ ${CHART} $(NO_COLOR)"
+	@helm dependency build ${CHART_DIR}
 
 .PHONY: package
 package:
-	@echo -e "$(ATTN_COLOR)==> package $(CHART) $(NO_COLOR)"
-	@mkdir -p $(CHART)/build
-	@helm package $(CHART) -u -d $(CHART)/build
+	@echo -e "$(ATTN_COLOR)==> $@ ${CHART} $(NO_COLOR)"
+	@mkdir -p ${CHART_DIR}/build
+	@helm package ${CHART_DIR} -u -d ${CHART_DIR}/build
 
 .PHONY: push
 push:
-	@echo -e "$(ATTN_COLOR)==> push $(CHART):$(CHART_VERSION) $(NO_COLOR)"
-	@helm push $(CHART)/build/$(CHART)-$(CHART_VERSION).tgz $(CHART_REPO)
+	@echo -e "$(ATTN_COLOR)==> $@ ${CHART}:$(CHART_VERSION) $(NO_COLOR)"
+	@helm push ${CHART_DIR}/build/${CHART}-$(CHART_VERSION).tgz $(CHART_REPO)
+
+.PHONY: lint
+lint:
+	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
+	@ct lint --config ct.yaml --helm-repo-extra-args "aserto-helm=-u gh -p ${GITHUB_TOKEN}"
+
 
 .PHONY: release
 release: build package push