Skip to content

Commit 9141b12

Browse files
committed
test
1 parent 16fa32d commit 9141b12

File tree

3 files changed

+2
-55
lines changed

3 files changed

+2
-55
lines changed

kustomize/default-rbac.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

kustomize/kustomization.yaml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,5 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
namespace: codefresh4
43
resources:
5-
- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.1/manifests/install.yaml
6-
- https://raw.githubusercontent.com/argoproj-labs/applicationset/master/manifests/install.yaml?ref=2c62537a8e5a # TODO: switch to the next release when available
7-
- default-rbac.yaml
4+
- https://raw.githubusercontent.com/codefresh-io/cli-v2/v0.0.291/manifests/argo-cd/kustomization.yaml
85
- ./runtime-installer/resources
9-
images:
10-
- name: quay.io/codefresh/argocd
11-
newName: quay.io/codefresh/argocd
12-
newTag: v2.1.11-cap-CR-10085
13-
14-
# will be effective on argo-cd 2.1
15-
configMapGenerator:
16-
- name: argocd-cm
17-
behavior: merge
18-
literals:
19-
- "timeout.reconciliation=20s"
20-
- "accounts.admin=apiKey,login" # need to be able to generate apikey for generic eventsource
21-
- name: argocd-cmd-params-cm
22-
behavior: merge
23-
literals:
24-
- "server.insecure=true"
25-
26-
patches:
27-
# reset the crbs to `subject.namespace: default`, so that argo-cd will later change them to the actual ns
28-
- target:
29-
group: rbac.authorization.k8s.io
30-
version: v1
31-
kind: ClusterRoleBinding
32-
patch: |-
33-
- op: replace
34-
path: /subjects/0/namespace
35-
value: default

kustomize/runtime-installer/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUNTIME_DEF_URL="https://github.com/codefresh-io/cli-v2/releases/VERSION/downloa
2323

2424
# Params:
2525
check_required_param "namespace" "${NAMESPACE}"
26-
check_required_param "csdp url" "${CSDP_URL}"
2726
check_required_param "csdp token" "${CSDP_TOKEN}"
2827
check_required_param "runtime repo" "${CSDP_RUNTIME_REPO}"
2928
check_required_param "git token" "${CSDP_RUNTIME_GIT_TOKEN}"
@@ -32,6 +31,7 @@ check_required_param "runtime ingress url" "${CSDP_RUNTIME_INGRESS_URL}"
3231
check_required_param "runtime name" "${CSDP_RUNTIME_NAME}"
3332

3433
# Defaults:
34+
CSDP_URL="${CSDP_URL:-https://g.codefresh.io}"
3535
CSDP_RUNTIME_VERSION="${CSDP_RUNTIME_VERSION:-latest}"
3636
CSDP_GIT_INTEGRATION_PROVIDER="${CSDP_GIT_INTEGRATION_PROVIDER:-GITHUB}"
3737
CSDP_GIT_INTEGRATION_API_URL="${CSDP_GIT_INTEGRATION_API_URL:-https://api.github.com}"

0 commit comments

Comments
 (0)