Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/gitops-runtime/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 0.2.3
description: A Helm chart for Codefresh gitops runtime
name: gitops-runtime
version: 0.29.10
version: 0.29.11
home: https://github.com/codefresh-io/gitops-runtime-helm
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
keywords:
Expand Down
3 changes: 3 additions & 0 deletions charts/gitops-runtime/ci/argocd-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
configs:
cm:
accounts.admin: apiKey,login
62 changes: 0 additions & 62 deletions charts/gitops-runtime/ci/default-values-custom-tls.yaml

This file was deleted.

15 changes: 6 additions & 9 deletions charts/gitops-runtime/ci/default-values.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
global:
codefresh:
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
accountId: 63dbba4928d5fd1ef065b781 # `gitops-helm-test` Codefresh account (see "gitops-runtime-helm CI" note in 1Password)
userToken:
secretKeyRef:
name: mysecret
key: myvalue
optional: true
token: "dummy" # set in `gitops-runtime-helm/ci` pipeline (see "gitops-runtime-helm CI" note in 1Password)

runtime:
name: default
cluster: test-cluster
name: "dummy" # set in `gitops-runtime-helm/ci` pipeline

ingress:
className: "nginx"
enabled: true
className: haproxy-ingress
hosts:
- runtime.codefresh.local
- "runtime.example.com" # set in `gitops-runtime-helm/ci` pipeline

repoCredentialsTemplate:
url: 'https://github.com'
Expand Down
20 changes: 0 additions & 20 deletions charts/gitops-runtime/ci/ingressless-values.yaml

This file was deleted.

26 changes: 14 additions & 12 deletions charts/gitops-runtime/ci/values-external-argocd.yaml
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
# Values file used to render all image values
global:
codefresh:
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
gitIntegration:
provider:
name: 'GITHUB'
apiUrl: 'https://api.github.com'
accountId: 63dbba4928d5fd1ef065b781 # `gitops-helm-test` Codefresh account
userToken:
secretKeyRef:
name: mysecret
key: myvalue
optional: true
token: "dummy" # set in `gitops-runtime-helm/ci` pipeline

runtime:
name: default
name: "dummy" # set in `gitops-runtime-helm/ci` pipeline

ingress:
enabled: false
enabled: true
className: haproxy-ingress
hosts:
- "runtime.example.com" # set in `gitops-runtime-helm/ci` pipeline

repoCredentialsTemplate:
url: 'https://github.com'
username: 'username'
password: 'dummy'

integrations:
argo-cd:
server:
svc: argocd-server
repoServer:
svc: argocd-repo-server

argo-cd:
enabled: false

Expand Down
7 changes: 7 additions & 0 deletions charts/gitops-runtime/ci/versions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"argo-cd": {
"chartVersion": "8.0.0"
}
}
]
4 changes: 3 additions & 1 deletion installer-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ARG TARGETARCH
ARG CF_CLI_VERSION=v1.0.2
RUN go install github.com/davidrjonas/semver-cli@latest \
&& cp $GOPATH/bin/semver-cli /tmp/semver-cli
RUN apt-get update && apt-get install -y --no-install-recommends sed && rm -rf /var/lib/apt/lists/*
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/


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