Skip to content

Commit 45fe735

Browse files
removed marketplace gitsource from hosted (#56)
* removed marketplace gitsource from hosted * bump 0.0.488
1 parent 51f8a0e commit 45fe735

File tree

4 files changed

+64
-29
lines changed

4 files changed

+64
-29
lines changed

csdp/base/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ configMapGenerator:
1111
- name: codefresh-cm
1212
behavior: create
1313
literals:
14-
- version=0.0.487
14+
- version=0.0.488

csdp/base_components/bootstrap/appset.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,6 @@ spec:
4444
kustomize:
4545
forceNamespace: true
4646

47-
- git:
48-
files:
49-
- path: csdp/base_components/git-sources/**/config_dir.json # replaced by specific flavor
50-
repoURL: https://github.com/codefresh-io/csdp-official.git
51-
requeueAfterSeconds: 15
52-
revision: RUNTIME_VERSION
53-
template:
54-
metadata:
55-
labels:
56-
codefresh.io/entity: "{{labels.codefresh_io_entity}}"
57-
codefresh.io/internal: "{{labels.codefresh_io_internal}}"
58-
finalizers:
59-
- resources-finalizer.argocd.argoproj.io
60-
spec:
61-
destination: {}
62-
project: ""
63-
source:
64-
repoURL: "{{srcRepoURL}}"
65-
path: "{{srcPath}}"
66-
targetRevision: "{{srcTargetRevision}}"
67-
directory:
68-
exclude: "{{exclude}}"
69-
include: "{{include}}"
70-
recurse: true
7147
template:
7248
metadata:
7349
labels:

csdp/base_components/bootstrap/kustomization.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ configMapGenerator:
1212
- name: codefresh-cm
1313
behavior: create
1414
literals:
15-
- version=0.0.487 # Runtime version
16-
- bootstrapRevision=0.0.487 # Tag to use for bootstrap
15+
- version=0.0.488 # Runtime version
16+
- bootstrapRevision=0.0.488 # Tag to use for bootstrap
1717
- appsetRequeueTime=15
1818

1919
replacements:
@@ -29,5 +29,4 @@ replacements:
2929
fieldPaths:
3030
- spec.generators.0.git.revision
3131
- spec.generators.1.git.revision
32-
- spec.generators.2.git.revision
3332
- spec.template.spec.source.targetRevision
Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,63 @@
11
apiVersion: kustomize.config.k8s.io/v1alpha1
22
kind: Component
3-
# Placeholder for future patches
3+
4+
# Add marketplace git-source
5+
patches:
6+
- target:
7+
version: v1alpha1
8+
group: argoproj.io
9+
kind: ApplicationSet
10+
patch: |-
11+
- op: add
12+
path: /spec/generators/-
13+
value: {
14+
"git": {
15+
"files": [
16+
{
17+
"path": "csdp/base_components/git-sources/**/config_dir.json"
18+
}
19+
],
20+
"repoURL": "https://github.com/codefresh-io/csdp-official.git",
21+
"requeueAfterSeconds": 15,
22+
"revision": "RUNTIME_VERSION",
23+
"template": {
24+
"metadata": {
25+
"labels": {
26+
"codefresh.io/entity": "{{labels.codefresh_io_entity}}",
27+
"codefresh.io/internal": "{{labels.codefresh_io_internal}}"
28+
},
29+
"finalizers": [
30+
"resources-finalizer.argocd.argoproj.io"
31+
]
32+
},
33+
"spec": {
34+
"destination": {},
35+
"project": "",
36+
"source": {
37+
"repoURL": "{{srcRepoURL}}",
38+
"path": "{{srcPath}}",
39+
"targetRevision": "{{srcTargetRevision}}",
40+
"directory": {
41+
"exclude": "{{exclude}}",
42+
"include": "{{include}}",
43+
"recurse": true
44+
}
45+
}
46+
}
47+
}
48+
}
49+
}
50+
51+
replacements:
52+
# template the version from the configmap into the applicationset generators
53+
# ** make sure the generator index is correct **
54+
- source:
55+
kind: ConfigMap
56+
name: codefresh-cm
57+
fieldPath: data.bootstrapRevision
58+
targets:
59+
- select:
60+
kind: ApplicationSet
61+
name: csdp
62+
fieldPaths:
63+
- spec.generators.2.git.revision

0 commit comments

Comments
 (0)