Skip to content

Commit e62a741

Browse files
yaroslav-codefreshPhilippPlotnikovdanielm-codefreshATGardnerpasha-codefresh
authored
0.1.23 (#180)
* [BE]:Up version (#126) * Up version * Up version * Up proxy version * Wip * Back version * Wip * add applications to app-proxy rbac (#124) * add applications to app-proxy rbac * bump * remove version bump * CR-15471-insecure-git-providers (#130) * add initContainer to app-proxy * move hosted to 2.4 (#129) Co-authored-by: Daniel Maizel <daniel.maizel@codefresh.io> * bumped app-proxy to 1.1982.0 (#132) * fix appset (#133) * fix appset * fix hosted installation * fix hybrid install * argocd 2.4 install * Debug * Revert "Debug" This reverts commit c02c9af. Co-authored-by: danielm-codefresh <daniel.maizel@codefresh.io> * bump app-proxy to 1.1991.1 (#138) * bump app-proxy to 1.1991.1 * CR-14423 (#136) app proxy update * Revert hosted move to argocd 2.4 (#139) * Revert "move hosted to 2.4 (#129)" This reverts commit 22f5ef5. * Revert "fix appset (#133)" This reverts commit aeeeb3a. * fix * update app-proxy (#141) * update app-proxy * hybrid test * Revert "hybrid test" This reverts commit e656ba8. * fix appProtocol for argocd-server to support Istio (#140) * Cr 24 hosted (#142) * Release 0.1.16 (#134) releasing 0.1.16 * Revert "Revert hosted move to argocd 2.4 (#139)" This reverts commit b63acd3 * hosted 2.4 * hosted 2.4 * runtime.yaml * fix hybrid * fix hybrid * revert VERSION Co-authored-by: Daniel Maizel <daniel.maizel@codefresh.io> * upgrade argo-workflows to 3.4 (#144) * =upgrade argo-workflows * fix changed ns * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * prepare for merge * wip * prepare for merge * update tag to 3.4.4 * Cr 15967 bb enr rc (#147) * mount argocd-token to app-proxy env * bumped app-proxy to 1.2016.2 Co-authored-by: Noam Gal <noam.gal@codefresh.io> Co-authored-by: andrii-codefresh <andrii@codefresh.io> * CR-15900-argo-cd-version-update (#149) argo-cd version update with rollback query * Revert "upgrade argo-workflows to 3.4 (#144)" This reverts commit ce2330b. * upgrade argo-rollouts to 1.4.0 (#152) * bump app-proxy (#155) * Argo workflow 3.4 upgrade (#157) * Revert "Revert "upgrade argo-workflows to 3.4 (#144)"" * add namespace override for argo-workflows Co-authored-by: danielm-codefresh <daniel.maizel@codefresh.io> * automatically merge release branch to main to avoid version drift (#158) * automatically merge release branch to main * add component version to release notes * bump app-proxy (#160) * bump app-proxy * bump * trigger * trigger * bump * remove redundent bump * bump app-proxy to 1.2056.0 (#162) change back to argocd user/password instead of token * Add permissions for app-proxy to read, list and patch deployments (#163) * readme * add permissions for app-proxy to read, list and patch deployments * Cr visa sw (#164) * new rollouts version * update rollouts * Add all release managers as code owners (#166) add all release managers as code owners * Update release.yaml * Argocd 25 (#168) * argocd 2.5 * argocd 2.5 * change version * change version back * Bump app-proxy to 1.2081.0 (#169) * bumped app-proxy to 1.2081.0 * bump-app-proxy (#170) * bumping argocd CR-16950-reporting-deadline (#174) * bumping argocd CR-16950-reporting-deadline * fix * remove bootstrapRevision * add additional env SKIP_TLS_VALIDATION (#175) * add additional env SKIP_TLS_VALIDATION * change version * update add cluster job wip update dockerfile wip wip wip wip wip wip add comment wip * Cr 17082 (#177) * security patch * security patch * security patch * add SKIP_PERMISSIONS_VALIDATION to app-proxy deploy and bump (#176) * add SKIP_PERMISSIONS_VALIDATION to app-proxy deploy * test app-proxy image * bump app-proxy * bump app-proxy * bump to 0.1.23-rc-0 * CR-16741-config-fix (#179) fix job yaml * bump to 0.1.23 --------- Co-authored-by: Philipp Plotnikov <philipp.plotnikov@codefresh.io> Co-authored-by: Daniel Maizel <daniel.maizel@codefresh.io> Co-authored-by: Noam Gal <noam.gal@codefresh.io> Co-authored-by: pasha-codefresh <pavel@codefresh.io> Co-authored-by: Oleksandr Saulyak <oleksandr.saulyak@codefresh.io> Co-authored-by: Andrii Shaforostov <andrii@codefresh.io> Co-authored-by: Denis Melnik <denis@codefresh.io> Co-authored-by: kim-codefresh <kim.aharfi@codefresh.io> Co-authored-by: roi-codefresh <roi.kramer@codefresh.io> Co-authored-by: pysarenko-bohdan <bohdan.pisarenko@codefresh.io>
1 parent f3e5c43 commit e62a741

File tree

10 files changed

+33
-14
lines changed

10 files changed

+33
-14
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.22
1+
0.1.23

‎add-cluster/Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
FROM bitnami/kubectl:1.24
22

3+
# curl was removed in the latest patches of bitnami/kubectl. Needs install it again.
4+
USER root
5+
RUN apt-get update && apt-get install -y curl
6+
7+
# set back user used in bitnami/kubectl
8+
USER 1001
39
WORKDIR /src
410

511
COPY add-cluster.sh .

‎add-cluster/add-cluster.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# LABELS (cm - optional)
88
# ANNOTATIONS (cm - optional)
99
# CSDP_TOKEN_SECRET
10+
# SKIP_TLS_VALIDATION (cm - optional)
1011

1112
SECRET_NAME=""
1213

@@ -40,20 +41,20 @@ echo "Server: ${SERVER}"
4041

4142
# Path to ServiceAccount token
4243
SERVICEACCOUNT=/var/run/secrets/kubernetes.io/serviceaccount
43-
4444
# Read this Pod's namespace
4545
NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace)
46-
47-
# Reference the internal certificate authority (CA)
48-
CACERT=${SERVICEACCOUNT}/ca.crt
49-
5046
# get ServiceAccount token
5147
get_service_account_secret_name || exit 1
5248
BEARER_TOKEN=$(kubectl get secret ${SECRET_NAME} -n ${NAMESPACE} -o jsonpath='{.data.token}' | base64 -d)
53-
5449
# write KUBE_COPNFIG_DATA to local file
5550
CLUSTER_NAME=$(echo ${SERVER} | sed s/'http[s]\?:\/\/'//)
56-
kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" --certificate-authority="${CACERT}" || exit 1
51+
if [[ $SKIP_TLS_VALIDATION == 'true' ]]
52+
then
53+
kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" || exit 1
54+
else
55+
# Reference the internal certificate authority (CA)
56+
kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" --certificate-authority="${SERVICEACCOUNT}/ca.crt" || exit 1
57+
fi
5758
kubectl config set-credentials "${SERVICE_ACCOUNT_NAME}" --token "${BEARER_TOKEN}" || exit 1
5859
kubectl config set-context "${CONTEXT_NAME}" --cluster="${CLUSTER_NAME}" --user="${SERVICE_ACCOUNT_NAME}" || exit 1
5960

‎add-cluster/kustomize/job.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ spec:
4444
configMapKeyRef:
4545
name: csdp-add-cluster-cm
4646
key: server
47+
- name: SKIP_TLS_VALIDATION
48+
valueFrom:
49+
configMapKeyRef:
50+
name: csdp-add-cluster-cm
51+
key: skipTLSValidation
52+
optional: true
4753
- name: CSDP_TOKEN_SECRET
4854
value: $(CSDP_ADD_CLUSTER_SECRET)
4955
volumeMounts:

‎csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@ spec:
161161
name: cap-app-proxy-cm
162162
key: stripPrefix
163163
optional: true
164+
- name: SKIP_PERMISSIONS_VALIDATION
165+
valueFrom:
166+
configMapKeyRef:
167+
name: cap-app-proxy-cm
168+
key: skipPermissionsValidation
169+
optional: true
164170
- name: NODE_EXTRA_CA_CERTS
165171
value: /app/config/all/all.cer
166172
image: quay.io/codefresh/cap-app-proxy

‎csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Component
33
images:
44
- name: quay.io/codefresh/cap-app-proxy
55
newName: quay.io/codefresh/cap-app-proxy
6-
newTag: 1.2084.2
6+
newTag: 1.2098.1
77
resources:
88
- app-proxy.deploy.yaml
99
- app-proxy.svc.yaml

‎csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resources:
55

66
images:
77
- name: quay.io/codefresh/argocd
8-
newTag: v2.5.5-cap-CR-fix-kustomize-v3
8+
newTag: v2.5.5-cap-CR-verify-aud-claim
99
- name: quay.io/codefresh/applicationset
1010
newTag: v0.4.2-CR-13254-remove-private-logs
1111

‎csdp/base_components/bootstrap/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ configMapGenerator:
99
- name: codefresh-cm
1010
behavior: create
1111
literals: # order matters - DO NOT change
12-
- version=0.1.22 # Runtime version
13-
- bootstrapRevision=0.1.22 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
12+
- version=0.1.23 # Runtime version
13+
- bootstrapRevision=0.1.23 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
1414
- appsetRequeueTime=15
1515
replacements:
1616
# template the version from the configmap into the applicationset generators

‎csdp/hybrid/basic/runtime.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
requiredCLIVersion: ^0.1.0
8-
version: 0.1.22
8+
version: 0.1.23
99
bootstrapSpecifier: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/argo-cd
1010
components:
1111
- name: events

‎csdp/hybrid/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# For backward compatibility - After change in csdp-managed-runtimes needs to be removed
1+
# For backward compatibility - After change in csdp-managed-runtimes needs to be removed
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44

0 commit comments

Comments
 (0)