Skip to content

Commit

Permalink
Added allowed resources that can be deployed in namespaces (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
saidsef authored Feb 4, 2023
1 parent 859056a commit 2e78787
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
6 changes: 4 additions & 2 deletions charts/applicationset/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: argocd-applicationsets-services
description: A HELM Chart for ArgoCD ApplicationSets for Kubernetes
type: application
version: &version "0.8.8"
version: &version "0.8.9"
appVersion: *version
kubeVersion: ">= 1.23"
home: https://github.com/saidsef/argocd-applicationsets-services
Expand All @@ -22,8 +22,10 @@ sources:
annotations:
artifacthub.io/license: "Apache-2.0"
artifacthub.io/changes: |
- kind: added
description: Added allowed resources that can be deployed in namespaces
- kind: fixed
description: Fixed typo in AppProj clusterResourceWhitelist
description: Fixed typo in GitHub PR URL
artifacthub.io/links: |
- name: README
url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/README.md
Expand Down
4 changes: 2 additions & 2 deletions charts/applicationset/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# argocd-applicationsets-services

![Version: 0.8.8](https://img.shields.io/badge/Version-0.8.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.8](https://img.shields.io/badge/AppVersion-0.8.8-informational?style=flat-square)
![Version: 0.8.9](https://img.shields.io/badge/Version-0.8.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.9](https://img.shields.io/badge/AppVersion-0.8.9-informational?style=flat-square)

A HELM Chart for ArgoCD ApplicationSets for Kubernetes

Expand Down Expand Up @@ -35,7 +35,7 @@ Kubernetes: `>= 1.23`
| globals.server | string | `"https://kubernetes.default.svc"` | ArgoCD server address |
| name | string | `"pr-reviews"` | ApplicationSet name |
| namespace | string | `"argocd"` | ArgoCD controller Namespace deployed |
| project | object | `{"clusterResourceBlacklist":[{"group":"argoproj.io","kind":"AppProject"}],"clusterResourceWhitelist":[{"group":"*","kind":"*"}],"destinations":[{"namespace":"previews","server":"https://kubernetes.default.svc"}],"enabled":false,"namespaceResourceBlacklist":[],"namespaceResourceWhitelist":[],"orphanedResources":{"warn":false},"roles":[],"sourceRepos":["*"],"syncWindows":[]}` | ArgoCD Project parameters |
| project | object | `{"clusterResourceBlacklist":[{"group":"argoproj.io","kind":"AppProject"}],"clusterResourceWhitelist":[{"group":"*","kind":"*"}],"destinations":[{"namespace":"previews","server":"https://kubernetes.default.svc"}],"enabled":true,"namespaceResourceBlacklist":[{"group":"argoproj.io","kind":"AppProject"}],"namespaceResourceWhitelist":[{"group":"*","kind":"*"}],"orphanedResources":{"warn":false},"roles":[],"sourceRepos":["*"],"syncWindows":[]}` | ArgoCD Project parameters |
| repos | object | `{"github":[{"images":["docker.io/saidsef/node-webserver:{{branch_slug}}"],"name":"node-webserver"},{"name":"alpine-jenkins-dockerfile","path":"deployment/preview"},{"images":["docker.io/saidsef/aws-kinesis-local:{{branch_slug}}"],"name":"aws-kinesis-local"},{"images":["docker.io/saidsef/aws-dynamodb-local:{{branch_slug}}"],"name":"aws-dynamodb-local"},{"name":"tika-document-to-text","path":"deployment/preview"},{"images":["docker.io/saidsef/k8s-spot-termination-notice:merge"],"name":"k8s-spot-termination-notice"},{"name":"scapy-containerised","path":"charts/scapy","values":{"image":{"tag":"{{branch_slug}}"}}},{"chart":"reverse-geocoding","name":"faas-reverse-geocoding","parameters":[{"name":"image.tag","value":"{{branch_slug}}"},{"name":"ingress.enabled","value":"true"},{"name":"ingress.enabled","value":"true"},{"name":"ingress.hosts[0].host","value":"{{branch_slug}}"}],"repoUrl":"https://saidsef.github.io/faas-reverse-geocoding"}],"gitlab":{}}` | List of repo names and override images for preview environment to dynamically pass the branch of the pull request head use '{{branch_slug}}' variable see: https://argocd-applicationset.readthedocs.io/en/stable/Generators-Pull-Request/#template |

----------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion charts/applicationset/templates/github-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
notifications.argoproj.io/subscribe.on-health-degraded.slack: '{{ $notificationChannel }}'
notifications.argoproj.io/subscribe.on-sync-failed.slack: '{{ $notificationChannel }}'
notifications.argoproj.io/subscribe.on-sync-running.slack: '{{ $notificationChannel }}'
link.argocd.argoproj.io/external-link: "{{ $pr }}/{{ $github.owner }}/{{or $repo.name $repo.path}}/pulls/{{ $dqf }}number{{ $dqb }}"
link.argocd.argoproj.io/external-link: "{{ $pr }}/{{ $github.owner }}/{{or $repo.name $repo.path}}/pull/{{ $dqf }}number{{ $dqb }}"
spec:
source:
{{- $localRepoUrl := printf "https://github.com/%s/%s.git" $github.owner $repo.name }}
Expand Down
12 changes: 8 additions & 4 deletions charts/applicationset/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ globals:

# -- ArgoCD Project parameters
project:
enabled: false
enabled: true
clusterResourceBlacklist:
- group: 'argoproj.io'
kind: AppProject
kind: 'AppProject'
clusterResourceWhitelist:
- group: '*'
kind: '*'
Expand All @@ -38,8 +38,12 @@ project:
- namespace: *deployToNamespace
server: 'https://kubernetes.default.svc'
# Allow all namespaced-scoped resources to be created, except for AppProject
namespaceResourceBlacklist: []
namespaceResourceWhitelist: []
namespaceResourceBlacklist:
- group: 'argoproj.io'
kind: 'AppProject'
namespaceResourceWhitelist:
- group: '*'
kind: '*'
orphanedResources:
warn: false
roles: []
Expand Down

0 comments on commit 2e78787

Please sign in to comment.