Wip

csdp/base/app-proxy/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.1402.0
+    newTag: 1.1403.2-restrict-incluster-deploy-ba95bab
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml

csdp/base/argo-cd/kustomization.yaml

@@ -9,7 +9,7 @@ images:
   - name: quay.io/codefresh/argocd
     newTag: v2.3.4-cap-CR-12110-helm-resources-yaml
   - name: quay.io/codefresh/applicationset
-    newTag: v0.4.2
+    newTag: test-incluster-block
 
 configMapGenerator:
   - behavior: merge

csdp/base/kustomization.yaml

@@ -1,11 +1,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+resources:
+  - ./project.yaml
+
 generatorOptions:
   disableNameSuffixHash: true
 
 configMapGenerator:
   - name: codefresh-cm
     behavior: create
     literals:
-      - version=0.0.391
+      - version=0.0.392

csdp/base/project.yaml

@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: PruneLast=true
+    argocd.argoproj.io/sync-wave: "-2"
+  creationTimestamp: null
+  name: csdp
+  namespace: default # replace
+spec:
+  clusterResourceWhitelist:
+    - group: "*"
+      kind: "*"
+  description: csdp project
+  destinations:
+    - namespace: "*"
+      server: "*"
+  namespaceResourceWhitelist:
+    - group: "*"
+      kind: "*"
+  sourceRepos:
+    - "*"

csdp/hybrid/appset.yaml

@@ -1,28 +1,4 @@
 apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-options: PruneLast=true
-    argocd.argoproj.io/sync-wave: "-2"
-  creationTimestamp: null
-  name: csdp
-  namespace: default # replace
-spec:
-  clusterResourceWhitelist:
-    - group: "*"
-      kind: "*"
-  description: csdp project
-  destinations:
-    - namespace: "*"
-      server: "*"
-  namespaceResourceWhitelist:
-    - group: "*"
-      kind: "*"
-  sourceRepos:
-    - "*"
-
----
-apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
   annotations:

csdp/managed/appset.yaml

@@ -1,28 +1,4 @@
 apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-options: PruneLast=true
-    argocd.argoproj.io/sync-wave: "-2"
-  creationTimestamp: null
-  name: csdp
-  namespace: default # replace
-spec:
-  clusterResourceWhitelist:
-    - group: "*"
-      kind: "*"
-  description: csdp project
-  destinations:
-    - namespace: "*"
-      server: "*"
-  namespaceResourceWhitelist:
-    - group: "*"
-      kind: "*"
-  sourceRepos:
-    - "*"
-
----
-apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
   annotations:

csdp/managed/argo-cd/allowed-apps-patch.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-cm
+data:
+  application.allowedDeliverToIncluster: |
+    - csdp-bootstrap
+    - csdp-argo-cd
+    - csdp-app-proxy
+    - csdp-argo-workflows
+    - csdp-sealed-secrets
+    - csdp-argo-events
+    - csdp-events-reporter
+    - csdp-workflow-reporter
+    - isc
+    - in-cluster

csdp/managed/argo-cd/kustomization.yaml

@@ -3,3 +3,6 @@ kind: Kustomization
 namespace: argocd
 resources:
   - ../../base/argo-cd
+
+patchesStrategicMerge:
+  - ./allowed-apps-patch.yaml

csdp/managed/in-cluster-project.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: git-sources
+  namespace: default # replace
+spec:
+  description: All of the git-sources will be in this project, destination is in-cluster and only applications resources may be deployed
+  clusterResourceWhitelist:
+    - group: "argoproj.io"
+      kind: "Application"
+  namespaceResourceWhitelist:
+    - group: "argoproj.io"
+      kind: "Application"
+  destinations:
+    - namespace: "*"
+      server: "https://kubernetes.default.svc"
+  sourceRepos:
+    - "*"

csdp/managed/kustomization.yaml

@@ -3,6 +3,7 @@ kind: Kustomization
 resources:
   - ../base
   - ./appset.yaml
+  - ./in-cluster-project.yaml
 
 patches:
   - target: