Merge pull request #13 from mbaldessari/cleanup-applicationsets-hoste…

…dargo

cleanup applicationsets hostedargo

.github/linters/.jscpd.json

@@ -1,6 +1,5 @@
 {
     "ignore": [
-        "templates/plumbing/hosted-sites.yaml",
         "templates/plumbing/applications.yaml",
         "templates/imperative/_helpers.tpl",
         "templates/core/subscriptions.yaml",

Chart.yaml

@@ -3,7 +3,7 @@ description: A Helm chart to create per-clustergroup ArgoCD applications and any
 keywords:
 - pattern
 name: clustergroup
-version: 0.9.4
+version: 0.9.5
 home: https://github.com/validatedpatterns/clustergroup-chart
 maintainers:
   - name: Validated Patterns Team

templates/core/catalog-sources.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{- range .Values.clusterGroup.indexImages }}
 {{- $name := mustRegexReplaceAll "[^/]*/(.*):.*" .image "${1}" | replace "/" "-" }}
 apiVersion: operators.coreos.com/v1alpha1
@@ -11,4 +10,3 @@ spec:
   image: {{ .image }}
 ---
 {{- end -}}
-{{- end -}}

templates/core/namespaces.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{- /*
   We first check if namespaces are defined as a map.  If it is we call
   our helper function in _helpers.tpl to process the namespaces
@@ -39,4 +38,3 @@ spec:
 ---
 {{- end }}
 {{- end }}
-{{- end }}

templates/core/operatorgroup.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{- /*
   We first check if namespaces are defined as a map.  If it is we call
   our helper function in _helpers.tpl to process the projects
@@ -51,4 +50,3 @@ spec:
 {{- end }} {{- /* if or (empty $.Values.clusterGroup.operatorgroupExcludes) (not (has . $.Values.clusterGroup.operatorgroupExcludes)) */}}
 {{- end }} {{- /* range $ns := .Values.clusterGroup.namespaces */}}
 {{- end }} {{- /* if kindIs "map" $ns */}}
-{{- end }} {{- /* if not (eq .Values.enabled "plumbing") */}}

templates/core/subscriptions.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{- range .Values.clusterGroup.subscriptions }}
 {{- $subs := . }}
 {{- $installPlanValue := .installPlanApproval }}
@@ -69,5 +68,3 @@ spec:
 ---
 {{- end }}
 {{- end }}
----
-{{- end }}

templates/imperative/clusterrole.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{/* This is always defined as we always unseal the cluster with an imperative job */}}
 {{- if $.Values.clusterGroup.imperative.serviceAccountCreate }}
 ---
@@ -34,4 +33,3 @@ rules:
     verbs:
     - '*'
 {{- end }} {{/* if $.Values.clusterGroup.imperative.adminServiceAccountCreate */}}
-{{- end }}

templates/imperative/configmap.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{/* This is always defined as we always unseal the cluster with an imperative job */}}
 {{- $valuesyaml := toYaml $.Values -}}
 apiVersion: v1
@@ -18,4 +17,3 @@ metadata:
   annotations:
   labels:
     config.openshift.io/inject-trusted-cabundle: 'true'
-{{- end }}

templates/imperative/job.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{/* Define this if needed (jobs defined */}}
 {{- if (and $.Values.clusterGroup.imperative (gt (len $.Values.clusterGroup.imperative.jobs) 0)) -}}
 ---
@@ -63,4 +62,3 @@ spec:
           {{- include "imperative.volumes_ca" . | indent 12 }}
           restartPolicy: Never
 {{- end }}
-{{- end }}

templates/imperative/rbac.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{/* This is always defined as we always unseal the cluster with an imperative job */}}
 {{- if $.Values.clusterGroup.imperative.serviceAccountCreate -}}
 ---
@@ -44,4 +43,3 @@ subjects:
     name: {{ $.Values.clusterGroup.imperative.adminServiceAccountName }}
     namespace: {{ $.Values.clusterGroup.imperative.namespace }}
 {{- end }}
-{{- end }}

templates/imperative/role.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{/* This is always defined as we always unseal the cluster with an imperative job */}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -17,4 +16,3 @@ rules:
     verbs:
     - '*'
 {{- end }}
-{{- end }}

templates/imperative/serviceaccount.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 {{/* This is always defined as we always unseal the cluster with an imperative job */}}
 {{- if $.Values.clusterGroup.imperative.serviceAccountCreate }}
 apiVersion: v1
@@ -15,4 +14,3 @@ metadata:
   name: {{ $.Values.clusterGroup.imperative.adminServiceAccountName }}
   namespace: {{ $.Values.clusterGroup.imperative.namespace }}
 {{- end }}
-{{- end }}

templates/plumbing/applications.yaml

@@ -1,123 +1,6 @@
-{{- if not (eq .Values.enabled "core") }}
 {{- $namespace := print $.Values.global.pattern "-" $.Values.clusterGroup.name }}
-{{- if (eq .Values.enabled "plumbing") }}
-{{- $namespace = "openshift-gitops" }}
-{{- end }}
 {{- range .Values.clusterGroup.applications }}
 {{- if .disabled }} {{- /* This allows us to null out an Application entry by specifying disabled: true in an override file */}}
-{{- else if or (.generators) (.generatorFile) (.useGeneratorValues) (.destinationServer) (.destinationNamespace) }}
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: {{ .name }}
-  namespace: {{ $namespace }}
-  labels:
-    app: {{ .name }}
-spec:
-  {{- if .generators }}
-  generators: {{ .generators | toPrettyJson }}
-  {{- else }}
-  generators:
-    - git:
-        repoURL: {{ $.Values.global.repoURL }}
-        revision: {{ $.Values.global.targetRevision }}
-        {{- if .generatorFile }}
-        files:
-          - path: {{ .generatorFile | quote }}
-        {{- end }}
-  {{- end }}
-  template:
-    metadata:
-      name: {{ coalesce .namespace $namespace }}
-    spec:
-      project: {{ .project }}
-      {{- if .syncPolicy }}
-      syncPolicy: {{ .syncPolicy | toPrettyJson }}
-      {{- else }}
-      syncPolicy:
-        automated: {}
-        retry:
-          limit: {{ default 20 $.Values.global.options.applicationRetryLimit }}
-      {{- end }}
-      {{- if .ignoreDifferences }}
-      ignoreDifferences: {{ .ignoreDifferences | toPrettyJson | nindent 2 }}
-      {{- end }}
-      source:
-        repoURL: {{ coalesce .repoURL $.Values.global.repoURL }}
-        targetRevision: {{ coalesce .targetRevision $.Values.global.targetRevision }}
-        {{- if .chart }}
-        chart: {{ .chart }}
-        {{- end }}
-        {{- if .path }}
-        path: {{ .path }}
-        {{- end }}
-        {{- if .plugin }}
-        plugin: {{ .plugin | toPrettyJson }}
-        {{- end }}
-        {{- if not .kustomize }}
-        helm:
-          ignoreMissingValueFiles: true
-          valueFiles:
-          {{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 12 }}
-        {{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }}
-            - {{ tpl $valueFile $ | quote }}
-        {{- end }}
-        {{- range $valueFile := .extraValueFiles }}
-            - {{ tpl $valueFile $ | quote }}
-        {{- end }}
-        {{- if .useGeneratorValues }}
-          values: |-
-            {{ `{{ values }}` }}
-        {{- end }}
-          parameters:
-          {{- include "clustergroup.app.globalvalues.helmparameters" $ | nindent 12 }}
-            - name: global.repoURL
-              value: {{ $.Values.global.repoURL }}
-            - name: global.targetRevision
-              value: {{ $.Values.global.targetRevision }}
-            - name: global.namespace
-              value: {{ $.Values.global.namespace }}
-            - name: clusterGroup.name
-              value: {{ $.Values.clusterGroup.name }}
-        {{- range .extraHubClusterDomainFields }}
-            - name: {{ . }}
-              value: {{ $.Values.global.hubClusterDomain }}
-        {{- end }}
-        {{- range .extraLocalClusterDomainFields }}
-            - name: {{ . }}
-              value: {{ $.Values.global.localClusterDomain }}
-        {{- end }}
-        {{- range .extraRepoURLFields }}
-            - name: {{ . }}
-              value: {{ $.Values.global.repoURL }}
-        {{- end }}
-        {{- range .extraTargetRevisionFields }}
-            - name: {{ . }}
-              value: {{ $.Values.global.targetRevision }}
-        {{- end }}
-        {{- range .extraNamespaceFields }}
-            - name: {{ . }}
-              value: {{ $.Values.global.namespace }}
-        {{- end }}
-        {{- range .extraPatternNameFields }}
-            - name: {{ . }}
-              value: {{ $.Values.global.pattern }}
-        {{- end }}
-        {{- range $k, $v := $.Values.extraParametersNested }}
-            - name: {{ $k }}
-              value: {{ printf "%s" $v | quote }}
-        {{- end }}
-        {{- range .overrides }}
-            - name: {{ .name  }}
-              value: {{ .value | quote  }}
-        {{- if .forceString }}
-              forceString: true
-        {{- end }}
-        {{- end }}
-        {{- end }}
-      destination:
-        server: {{ coalesce .destinationServer "https://kubernetes.default.svc" }}
-        namespace: {{ coalesce .destinationNamespace .namespace $namespace }}
 {{- else }}
 ---
 apiVersion: argoproj.io/v1alpha1
@@ -295,6 +178,5 @@ spec:
     retry:
       limit: {{ default 20 $.Values.global.applicationRetryLimit }}
   {{- end }}{{- /* .syncPolicy */}}
-{{- end }}{{- /* if or (.generators) (.generatorFile) (.useGeneratorValues) (.destinationServer) (.destinationNamespace) */}}
+{{- end }}{{- /* if .disabled */}}
 {{- end }}{{- /* range .Values.clusterGroup.applications */}}
-{{- end }}{{- /* if not (eq .Values.enabled "core") */}}

templates/plumbing/argocd-super-role.yaml

@@ -1,4 +1,3 @@
-{{- if (eq .Values.enabled "all") }}
 # WARNING: ONLY USE THIS FOR MANAGING CLUSTERS NOT FOR REGULAR USERS
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -48,4 +47,3 @@ subjects:
   - kind: ServiceAccount
     name: {{ .Values.clusterGroup.name }}-gitops-argocd-dex-server
     namespace: {{ $.Values.global.pattern }}-{{ .Values.clusterGroup.name }}
-{{- end }}

templates/plumbing/argocd.yaml

@@ -1,5 +1,3 @@
-
-{{- if (eq .Values.enabled "all") }}
 {{- $namespace := print $.Values.global.pattern "-" $.Values.clusterGroup.name }}
 apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
@@ -204,4 +202,3 @@ spec:
   href: 'https://{{ .Values.clusterGroup.name }}-gitops-server-{{ $namespace }}.{{ coalesce .Values.global.localClusterDomain .Values.global.hubClusterDomain }}'
   location: ApplicationMenu
   text: '{{ title .Values.clusterGroup.name }} ArgoCD'
-{{- end }}

templates/plumbing/gitops-namespace.yaml

@@ -1,4 +1,3 @@
-{{- if not (eq .Values.enabled "plumbing") }}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -10,4 +9,3 @@ metadata:
   # - any references to secrets and route URLs in documentation
   name: {{ $.Values.global.pattern }}-{{ .Values.clusterGroup.name }}
 spec: {}
-{{- end }}