Skip to content

Commit 2317232

Browse files
danielm-codefreshPhilippPlotnikovATGardnerpasha-codefresh
authored
Release 0.1.15 (#131)
* [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> * [BE]:Up version (#126) * Up version * Up version * Up proxy version * Wip * Back version * Wip * 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> * testing release 0.1.15 * bumped app-proxy to 1.1982.0 (#132) * Revert "move hosted to 2.4 (#129)" This reverts commit 22ee608. * bump * 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>
1 parent 2215ccd commit 2317232

File tree

5 files changed

+51
-11
lines changed

5 files changed

+51
-11
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.14
1+
0.1.15

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

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,34 @@ spec:
1414
app: cap-app-proxy
1515
spec:
1616
serviceAccountName: cap-app-proxy
17+
initContainers:
18+
- name: init-certs
19+
image: alpine:3.16
20+
imagePullPolicy: Always
21+
command:
22+
- sh
23+
- -c
24+
- |
25+
/bin/sh <<'EOF'
26+
if [ $(ls /app/config/tls) ]; then
27+
echo "concatenating certs into /app/config/all/all.cer"
28+
cat /app/config/tls/* >> /app/config/all/all.cer
29+
else
30+
echo "no certs to concatenate"
31+
fi
32+
EOF
33+
volumeMounts:
34+
- mountPath: /app/config/tls
35+
name: tls-certs
36+
- mountPath: /app/config/all
37+
name: all-certs
38+
resources:
39+
limits:
40+
memory: 512Mi
41+
cpu: '1'
42+
requests:
43+
memory: 256Mi
44+
cpu: '0.2'
1745
containers:
1846
- env:
1947
- name: ARGO_CD_URL
@@ -120,6 +148,8 @@ spec:
120148
name: cap-app-proxy-cm
121149
key: stripPrefix
122150
optional: true
151+
- name: NODE_EXTRA_CA_CERTS
152+
value: /app/config/all/all.cer
123153
image: quay.io/codefresh/cap-app-proxy
124154
imagePullPolicy: Always
125155
name: cap-app-proxy
@@ -141,12 +171,22 @@ spec:
141171
containerPort: 80
142172
resources:
143173
requests:
144-
memory: "512Mi"
145-
ephemeral-storage: "2Gi"
146-
cpu: "100m"
174+
memory: '512Mi'
175+
ephemeral-storage: '2Gi'
176+
cpu: '100m'
147177
limits:
148-
memory: "1Gi"
149-
ephemeral-storage: "6Gi"
150-
cpu: "1500m"
178+
memory: '1Gi'
179+
ephemeral-storage: '6Gi'
180+
cpu: '1500m'
151181
securityContext:
152182
allowPrivilegeEscalation: false
183+
volumeMounts:
184+
- mountPath: /app/config/all
185+
name: all-certs
186+
volumes:
187+
- name: all-certs
188+
emptyDir: {}
189+
- configMap:
190+
defaultMode: 420
191+
name: argocd-tls-certs-cm
192+
name: tls-certs

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.1973.1
6+
newTag: 1.1982.0
77
resources:
88
- app-proxy.deploy.yaml
99
- app-proxy.svc.yaml

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.14 # Runtime version
13-
- bootstrapRevision=0.1.14 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
12+
- version=0.1.15 # Runtime version
13+
- bootstrapRevision=0.1.15 # 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.14
8+
version: 0.1.15
99
bootstrapSpecifier: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/argo-cd
1010
components:
1111
- name: events

0 commit comments

Comments
 (0)