Skip to content

Commit a525c0a

Browse files
danielm-codefreshPhilippPlotnikovATGardnerpasha-codefresholeksandr-codefresh
authored
Test release 0.1.27 (#202)
* [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 * CR-16741-config-fix (#179) fix job yaml * update argo workflows to fix empty page issue (#182) * fixed role resource name (#183) * Cr argocd 26 (#184) * argocd 2.6 * change version * change version * new argo version (#187) * Revert "update argo workflows to fix empty page issue (#182)" This reverts commit 3e239a8. * argo workflows exit handler fix (#188) * Update kustomization.yaml * Update kustomization.yaml * Cr argocd26 appset (#190) * change version * change version * change version * custom hybrid argocd version * custom hybrid argocd version * Bump app-proxy to 1.2133.0 (#192) * bump app-proxy to `1.2140.0` (#193) bump app-proxy to 1.2140.0 * CR-17122 (#191) * Update kustomization.yaml * Update runtime.yaml * Update runtime.yaml * Update runtime.yaml * Update kustomization.yaml * Update runtime.yaml * Update runtime.yaml * Update runtime.yaml * Update runtime.yaml * Update runtime.yaml * Update runtime.yaml * wip * bump app-proxy 1.2143.0 * updated role (#194) * updated role * added a list of missing env vars, injected from cm (#197) all of those env vars are optional, and the current `cap-app-proxy-cm` do not contain values for them. that means the pod will run like it used to run before, by using default values in the code. there should be no risk. * Add-cluster-insecure (#198) * added --insecure-skip-tls-verify flag to script * updated add-cluster version to 0.7.0 * fixed initCerts to handle multiple files * bump app-proxy to a version that includes the option to decouple runt… (#196) * bump app-proxy to a version that includes the option to decouple runtime name and namespace --------- Co-authored-by: Noam Gal <noam.gal@codefresh.io> * bump app-proxy and argo-cd (#201) * bump prerelease * update argo-cd for hybrid * fix * update app-proxy * fix app-proxy * bump prerelease * bump prerelease * add label selector to app-proxy service * bump prerelease * bump app-proxy * bump prerelease * bump app-proxy * remove pre-release postfix --------- Co-authored-by: Philipp Plotnikov <philipp.plotnikov@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> Co-authored-by: vadim-kharin-codefresh <vadim.kharin@codefresh.io> Co-authored-by: Eti Zaguri <eti.zaguri@codefresh.io>
1 parent eae149d commit a525c0a

File tree

14 files changed

+174
-67
lines changed

14 files changed

+174
-67
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.26
1+
0.1.27

‎add-cluster/add-cluster.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ BEARER_TOKEN=$(kubectl get secret ${SECRET_NAME} -n ${NAMESPACE} -o jsonpath='{.
5050
CLUSTER_NAME=$(echo ${SERVER} | sed s/'http[s]\?:\/\/'//)
5151
if [[ $SKIP_TLS_VALIDATION == 'true' ]]
5252
then
53-
kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" || exit 1
53+
kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" --insecure-skip-tls-verify=true || exit 1
5454
else
5555
# Reference the internal certificate authority (CA)
5656
kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" --certificate-authority="${SERVICEACCOUNT}/ca.crt" || exit 1
5757
fi
58+
5859
kubectl config set-credentials "${SERVICE_ACCOUNT_NAME}" --token "${BEARER_TOKEN}" || exit 1
5960
kubectl config set-context "${CONTEXT_NAME}" --cluster="${CLUSTER_NAME}" --user="${SERVICE_ACCOUNT_NAME}" || exit 1
6061

@@ -84,4 +85,4 @@ if [[ $STATUS_CODE -ge 300 ]]; then
8485
fi
8586

8687
echo "deleting token secret ${CSDP_TOKEN_SECRET}"
87-
kubectl delete secret ${CSDP_TOKEN_SECRET} -n ${NAMESPACE} || echo "warning: failed deleting secret ${CSDP_TOKEN_SECRET}. you can safely delete this secret manually later with: kubectl delete secret ${CSDP_TOKEN_SECRET} -n ${NAMESPACE}"
88+
kubectl delete secret ${CSDP_TOKEN_SECRET} -n ${NAMESPACE} || echo "warning: failed deleting secret ${CSDP_TOKEN_SECRET}. you can safely delete this secret manually later with: kubectl delete secret ${CSDP_TOKEN_SECRET} -n ${NAMESPACE}"

‎add-cluster/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ type: application
66

77
version: 0.2.0
88

9-
appVersion: 0.6.0
9+
appVersion: 0.7.0

‎add-cluster/kustomize/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace: kube-system
44

55
images:
66
- name: quay.io/codefresh/csdp-add-cluster
7-
newTag: 0.6.0
7+
newTag: 0.7.0
88

99
resources:
1010
- configmap.yaml

‎csdp/base_components/README.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
All resources are defined using Kustomize components in this folder in the following structure:
23

34
base_components:
@@ -10,4 +11,4 @@ base_components:
1011
this allows us to create configuration bundles - for example HA and non HA configurations.
1112
Try to keep resources and patches out of the bundle kustomization, it should contain only the composition
1213
of components.
13-
bootstrap: This is the bootstrap component
14+
bootstrap: This is the bootstrap component

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4+
labels:
5+
app.kubernetes.io/part-of: cap-app-proxy
46
name: cap-app-proxy-cm
57
data:
68
argoCdUsername: admin

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4+
labels:
5+
app: cap-app-proxy
46
name: cap-app-proxy-binding
57
roleRef:
68
apiGroup: rbac.authorization.k8s.io

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

Lines changed: 108 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
labels:
5-
app: cap-app-proxy
64
name: cap-app-proxy
75
spec:
6+
replicas: 1
87
selector:
98
matchLabels:
109
app: cap-app-proxy
@@ -23,7 +22,7 @@ spec:
2322
- -c
2423
- |
2524
/bin/sh <<'EOF'
26-
if [ $(ls /app/config/tls) ]; then
25+
if [ "$(ls /app/config/tls)" ]; then
2726
echo "concatenating certs into /app/config/all/all.cer"
2827
cat /app/config/tls/* >> /app/config/all/all.cer
2928
else
@@ -45,6 +44,12 @@ spec:
4544
cpu: '0.2'
4645
containers:
4746
- env:
47+
- name: ARGO_CD_INSECURE
48+
valueFrom:
49+
configMapKeyRef:
50+
name: cap-app-proxy-cm
51+
key: argoCdInsecure
52+
optional: true
4853
- name: ARGO_CD_URL
4954
valueFrom:
5055
configMapKeyRef:
@@ -92,6 +97,54 @@ spec:
9297
name: cap-app-proxy-cm
9398
key: env
9499
optional: true
100+
- name: ISC_ENSURED_EVENT_EMIT_DELAY
101+
valueFrom:
102+
configMapKeyRef:
103+
name: cap-app-proxy-cm
104+
key: iscEnsuredEventEmitDelay
105+
optional: true
106+
- name: IRW_CONCURRENCY_CM_KEY
107+
valueFrom:
108+
configMapKeyRef:
109+
name: cap-app-proxy-cm
110+
key: irwConcurrencyCmKey
111+
optional: true
112+
- name: IRW_CONCURRENCY_CM_NAME
113+
valueFrom:
114+
configMapKeyRef:
115+
name: cap-app-proxy-cm
116+
key: irwConcurrentyCmName
117+
optional: true
118+
- name: IRW_HEARTBEAT_INTERVAL_IN_SECONDS
119+
valueFrom:
120+
configMapKeyRef:
121+
name: cap-app-proxy-cm
122+
key: irwHeartbeatIntervalInSeconds
123+
optional: true
124+
- name: IRW_POD_GC_STRATEGY
125+
valueFrom:
126+
configMapKeyRef:
127+
name: cap-app-proxy-cm
128+
key: irwPodGcStrategy
129+
optional: true
130+
- name: IRW_SERVICE_ACCOUNT
131+
valueFrom:
132+
configMapKeyRef:
133+
name: cap-app-proxy-cm
134+
key: irwServiceAccount
135+
optional: true
136+
- name: IRW_TTL_ACTIVE_IN_SECONDS
137+
valueFrom:
138+
configMapKeyRef:
139+
name: cap-app-proxy-cm
140+
key: irwTtlActiveInSeconds
141+
optional: true
142+
- name: IRW_TTL_AFTER_COMPLETION_IN_SECONDS
143+
valueFrom:
144+
configMapKeyRef:
145+
name: cap-app-proxy-cm
146+
key: irwTtlAfterCompletionInSeconds
147+
optional: true
95148
- name: GRAPHQL_DEBUG
96149
valueFrom:
97150
configMapKeyRef:
@@ -104,6 +157,12 @@ spec:
104157
name: cap-app-proxy-cm
105158
key: graphqlPlayground
106159
optional: true
160+
- name: LOG_LEVEL
161+
valueFrom:
162+
configMapKeyRef:
163+
name: cap-app-proxy-cm
164+
key: logLevel
165+
optional: true
107166
- name: NAMESPACE
108167
valueFrom:
109168
fieldRef:
@@ -114,6 +173,18 @@ spec:
114173
name: cap-app-proxy-cm
115174
key: port
116175
optional: true
176+
- name: GIT_INTEGRATION_APIURL
177+
valueFrom:
178+
configMapKeyRef:
179+
name: cap-app-proxy-cm
180+
key: gitIntegrationApiUrl
181+
optional: true
182+
- name: GIT_INTEGRATION_PROVIDER
183+
valueFrom:
184+
configMapKeyRef:
185+
name: cap-app-proxy-cm
186+
key: gitIntegrationProvider
187+
optional: true
117188
- name: GIT_USERNAME
118189
valueFrom:
119190
secretKeyRef:
@@ -126,6 +197,20 @@ spec:
126197
name: autopilot-secret
127198
key: git_token
128199
optional: true
200+
- name: NODE_EXTRA_CA_CERTS
201+
value: /app/config/all/all.cer
202+
- name: REPO_CREDS_SECRET_NAME
203+
valueFrom:
204+
configMapKeyRef:
205+
name: cap-app-proxy-cm
206+
key: repoCredsSecretName
207+
optional: true
208+
- name: REPO_LOCK_TIMEOUT
209+
valueFrom:
210+
configMapKeyRef:
211+
name: cap-app-proxy-cm
212+
key: repoLockTimeout
213+
optional: true
129214
- name: REPOS_DIR
130215
valueFrom:
131216
configMapKeyRef:
@@ -149,6 +234,18 @@ spec:
149234
name: codefresh-token
150235
key: encryptionIV
151236
optional: true
237+
- name: SEND_HEARTBEAT_INTERVAL
238+
valueFrom:
239+
configMapKeyRef:
240+
name: cap-app-proxy-cm
241+
key: sendHeartbeatInterval
242+
optional: true
243+
- name: SKIP_PERMISSIONS_VALIDATION
244+
valueFrom:
245+
configMapKeyRef:
246+
name: cap-app-proxy-cm
247+
key: skipPermissionsValidation
248+
optional: true
152249
- name: STORE_BACKEND
153250
valueFrom:
154251
configMapKeyRef:
@@ -161,14 +258,18 @@ spec:
161258
name: cap-app-proxy-cm
162259
key: stripPrefix
163260
optional: true
164-
- name: SKIP_PERMISSIONS_VALIDATION
261+
- name: USER_CACHE_TTL
165262
valueFrom:
166263
configMapKeyRef:
167264
name: cap-app-proxy-cm
168-
key: skipPermissionsValidation
265+
key: userCacheTtl
266+
optional: true
267+
- name: USER_TOKEN
268+
valueFrom:
269+
secretKeyRef:
270+
name: codefresh-user-token
271+
key: token
169272
optional: true
170-
- name: NODE_EXTRA_CA_CERTS
171-
value: /app/config/all/all.cer
172273
image: quay.io/codefresh/cap-app-proxy
173274
imagePullPolicy: Always
174275
name: 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.2143.0
6+
newTag: 1.2167.0
77
resources:
88
- app-proxy.deploy.yaml
99
- app-proxy.svc.yaml

‎csdp/base_components/apps/app-proxy/_components/ha-manifests/kustomization.yaml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,53 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
22
kind: Component
33

44
resources:
5-
- pdb.yaml
5+
- pdb.yaml
66

77
patches:
8-
# increase replicas
9-
- target:
10-
group: apps
11-
version: v1
12-
kind: Deployment
13-
name: cap-app-proxy
14-
patch: |-
15-
- op: add
16-
path: /spec/replicas
17-
value: 2
18-
# Add leader election sidecar
19-
- target:
20-
group: apps
21-
version: v1
22-
kind: Deployment
23-
name: cap-app-proxy
24-
path: leader-election.deployment.patch.yaml
25-
# Add leader election role
26-
- target:
27-
kind: Role
28-
name: cap-app-proxy
29-
patch: |-
30-
- op: add
31-
path: /rules/-
32-
value:
33-
apiGroups:
34-
- coordination.k8s.io
35-
resources:
36-
- leases
37-
verbs:
38-
- get
39-
- list
40-
- watch
41-
- create
42-
- update
43-
- patch
44-
- delete
45-
- op: add
46-
path: /rules/-
47-
value:
48-
apiGroups:
49-
- ""
50-
resources:
51-
- events
52-
verbs:
53-
- create
54-
- patch
8+
# increase replicas
9+
- target:
10+
group: apps
11+
version: v1
12+
kind: Deployment
13+
name: cap-app-proxy
14+
patch: |-
15+
- op: replace
16+
path: /spec/replicas
17+
value: 2
18+
# Add leader election sidecar
19+
- target:
20+
group: apps
21+
version: v1
22+
kind: Deployment
23+
name: cap-app-proxy
24+
path: leader-election.deployment.patch.yaml
25+
# Add leader election role
26+
- target:
27+
kind: Role
28+
name: cap-app-proxy
29+
patch: |-
30+
- op: add
31+
path: /rules/-
32+
value:
33+
apiGroups:
34+
- coordination.k8s.io
35+
resources:
36+
- leases
37+
verbs:
38+
- get
39+
- list
40+
- watch
41+
- create
42+
- update
43+
- patch
44+
- delete
45+
- op: add
46+
path: /rules/-
47+
value:
48+
apiGroups:
49+
- ""
50+
resources:
51+
- events
52+
verbs:
53+
- create
54+
- patch

0 commit comments

Comments
 (0)