Skip to content

Commit 8cf3427

Browse files
feat: move CI from argo workflows to classic builds (#1196)
1 parent 8b2043c commit 8cf3427

7 files changed

Lines changed: 33 additions & 104 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
configs:
2+
cm:
3+
accounts.admin: apiKey,login

charts/gitops-runtime/ci/default-values-custom-tls.yaml

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

charts/gitops-runtime/ci/default-values.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
global:
22
codefresh:
3-
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
3+
accountId: 63dbba4928d5fd1ef065b781 # `gitops-helm-test` Codefresh account (see "gitops-runtime-helm CI" note in 1Password)
44
userToken:
5-
secretKeyRef:
6-
name: mysecret
7-
key: myvalue
8-
optional: true
5+
token: "dummy" # set in `gitops-runtime-helm/ci` pipeline (see "gitops-runtime-helm CI" note in 1Password)
96

107
runtime:
11-
name: default
12-
cluster: test-cluster
8+
name: "dummy" # set in `gitops-runtime-helm/ci` pipeline
139

1410
ingress:
15-
className: "nginx"
11+
enabled: true
12+
className: haproxy-ingress
1613
hosts:
17-
- runtime.codefresh.local
14+
- "runtime.example.com" # set in `gitops-runtime-helm/ci` pipeline
1815

1916
repoCredentialsTemplate:
2017
url: 'https://github.com'

charts/gitops-runtime/ci/ingressless-values.yaml

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

charts/gitops-runtime/ci/values-external-argocd.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
# Values file used to render all image values
21
global:
32
codefresh:
4-
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
5-
gitIntegration:
6-
provider:
7-
name: 'GITHUB'
8-
apiUrl: 'https://api.github.com'
3+
accountId: 63dbba4928d5fd1ef065b781 # `gitops-helm-test` Codefresh account
94
userToken:
10-
secretKeyRef:
11-
name: mysecret
12-
key: myvalue
13-
optional: true
5+
token: "dummy" # set in `gitops-runtime-helm/ci` pipeline
146

157
runtime:
16-
name: default
8+
name: "dummy" # set in `gitops-runtime-helm/ci` pipeline
179

1810
ingress:
19-
enabled: false
11+
enabled: true
12+
className: haproxy-ingress
13+
hosts:
14+
- "runtime.example.com" # set in `gitops-runtime-helm/ci` pipeline
2015

2116
repoCredentialsTemplate:
2217
url: 'https://github.com'
2318
username: 'username'
2419
password: 'dummy'
2520

21+
integrations:
22+
argo-cd:
23+
server:
24+
svc: argocd-server
25+
repoServer:
26+
svc: argocd-repo-server
27+
2628
argo-cd:
2729
enabled: false
2830

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[
2+
{
3+
"argo-cd": {
4+
"chartVersion": "8.0.0"
5+
}
6+
}
7+
]

installer-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ARG TARGETARCH
66
ARG CF_CLI_VERSION=v1.0.2
77
RUN go install github.com/davidrjonas/semver-cli@latest \
88
&& cp $GOPATH/bin/semver-cli /tmp/semver-cli
9+
RUN apt-get update && apt-get install -y --no-install-recommends sed && rm -rf /var/lib/apt/lists/*
910
ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz /tmp/cf/
1011

1112

@@ -14,5 +15,6 @@ FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@s
1415
ARG TARGETARCH
1516
COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/cf/cf-linux-${TARGETARCH} /usr/local/bin/cf
1617
COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/semver-cli /usr/local/bin/semver-cli
18+
COPY --from=build /usr/bin/sed /usr/bin/sed
1719
WORKDIR /home/codefresh
18-
USER nonroot
20+
USER nonroot

0 commit comments

Comments
 (0)