Skip to content

feat: Add multi-arch add-clusters image #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
fa2803e
feat: Add multi-arch
dacamposol Nov 1, 2022
75f2f50
Merge branch 'main' into main
dacamposol Nov 2, 2022
69f67c2
Merge branch 'main' into main
dacamposol Nov 16, 2022
21e19a5
[BE]:Up version (#126)
PhilippPlotnikov Nov 18, 2022
aab1ea6
add applications to app-proxy rbac (#124)
danielm-codefresh Nov 18, 2022
bbb568c
CR-15471-insecure-git-providers (#130)
ATGardner Nov 20, 2022
22f5ef5
move hosted to 2.4 (#129)
pasha-codefresh Nov 20, 2022
9913fae
bumped app-proxy to 1.1982.0 (#132)
ATGardner Nov 20, 2022
409ffcc
Merge remote-tracking branch 'origin/release-0.1'
danielm-codefresh Nov 24, 2022
aeeeb3a
fix appset (#133)
pasha-codefresh Nov 24, 2022
27d6d60
bump app-proxy to 1.1991.1 (#138)
ATGardner Nov 29, 2022
e1341d1
CR-14423 (#136)
oleksandr-codefresh Nov 29, 2022
b63acd3
Revert hosted move to argocd 2.4 (#139)
danielm-codefresh Nov 30, 2022
30f438e
update app-proxy (#141)
andrii-codefresh Dec 2, 2022
b82f6ea
fix appProtocol for argocd-server to support Istio (#140)
danielm-codefresh Dec 4, 2022
31cc736
Cr 24 hosted (#142)
pasha-codefresh Dec 4, 2022
d5dfc7a
Merge remote-tracking branch 'origin/release-0.1'
danielm-codefresh Dec 6, 2022
ce2330b
upgrade argo-workflows to 3.4 (#144)
denis-codefresh Dec 13, 2022
cf57c76
Cr 15967 bb enr rc (#147)
denis-codefresh Dec 18, 2022
57eee66
CR-15900-argo-cd-version-update (#149)
oleksandr-codefresh Dec 19, 2022
2ddb9ac
Merge remote-tracking branch 'origin/release-0.1'
danielm-codefresh Dec 21, 2022
7f5929b
Revert "upgrade argo-workflows to 3.4 (#144)"
danielm-codefresh Dec 21, 2022
339f028
upgrade argo-rollouts to 1.4.0 (#152)
danielm-codefresh Jan 2, 2023
6d8e32b
bump app-proxy (#155)
danielm-codefresh Jan 3, 2023
01e1502
Merge remote-tracking branch 'origin/release-0.1'
danielm-codefresh Jan 5, 2023
d23d40d
Argo workflow 3.4 upgrade (#157)
denis-codefresh Jan 10, 2023
88126ed
automatically merge release branch to main to avoid version drift (#158)
danielm-codefresh Jan 10, 2023
257ad10
Merge remote-tracking branch 'origin/release-0.1'
danielm-codefresh Jan 11, 2023
837d3ec
bump app-proxy (#160)
kim-codefresh Jan 15, 2023
0c63e7e
bump app-proxy to 1.2056.0 (#162)
ATGardner Jan 15, 2023
e6d4a88
Add permissions for app-proxy to read, list and patch deployments (#163)
danielm-codefresh Jan 16, 2023
a6b2dc1
Cr visa sw (#164)
pasha-codefresh Jan 16, 2023
d9a86e1
Merge branch 'main' into main
dacamposol Jan 17, 2023
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
14 changes: 11 additions & 3 deletions add-cluster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
FROM bitnami/kubectl:1.24
FROM bitnami/minideb:bullseye

ARG VERSION="1.24"

RUN apt-get update && \
apt-get install -y ca-certificates curl && \
curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg && \
echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list && \
apt-get update && \
apt-get install -y kubectl="${VERSION}.*"

WORKDIR /src

COPY add-cluster.sh .

CMD [ "./add-cluster.sh" ]

CMD [ "./add-cluster.sh"]
ENTRYPOINT [ "bash" ]
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,17 @@ spec:
name: cap-app-proxy-cm
key: argoCdUrl
optional: true
- name: ARGO_CD_TOKEN
- name: ARGO_CD_USERNAME
valueFrom:
configMapKeyRef:
name: cap-app-proxy-cm
key: argoCdUsername
optional: true
- name: ARGO_CD_PASSWORD
valueFrom:
secretKeyRef:
name: argocd-token
key: token
name: argocd-initial-admin-secret
key: password
- name: ARGO_WORKFLOWS_INSECURE
valueFrom:
configMapKeyRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ rules:
verbs:
- get
- list
- apiGroups:
- "apps"
resources:
- deployments
verbs:
- get
- list
- patch
- apiGroups:
- argoproj.io
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Component
images:
- name: quay.io/codefresh/cap-app-proxy
newName: quay.io/codefresh/cap-app-proxy
newTag: 1.2033.0
newTag: 1.2056.0
resources:
- app-proxy.deploy.yaml
- app-proxy.svc.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- https://github.com/codefresh-io/argo-rollouts/releases/download/v1.4.0-cap-CR-10626/install.yaml
- https://github.com/codefresh-io/argo-rollouts/releases/download/v1.4.0-cap-sw/install.yaml
patches:
- target:
group: apiextensions.k8s.io
Expand Down