Skip to content

Commit a4d39f3

Browse files
committed
changed buildah to copy conf
1 parent d17908d commit a4d39f3

File tree

4 files changed

+46
-7
lines changed

4 files changed

+46
-7
lines changed

.tekton/buildah-task.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ spec:
5858
type: array
5959
default:
6060
- ""
61+
- name: CONFIG_MAP_NAME
62+
description: Name of a ConfigMap to copy data into workspace
63+
type: string
64+
default: ""
65+
- name: CONFIG_MAP_KEY_VALUE
66+
description: Key value of file name to copy
67+
type: string
68+
default: ""
69+
- name: CONFIG_DATA_WORKSPACE_DEST
70+
description: Destination path for ConfigMap's data in workspace
71+
type: string
72+
default: ""
6173
workspaces:
6274
- name: source
6375
- name: sslcertdir
@@ -99,6 +111,10 @@ spec:
99111
args:
100112
- $(params.BUILD_ARGS[*])
101113
script: |
114+
if [ -n "$(params.CONFIG_MAP_NAME)" ]; then
115+
cp /var/confmap $(params.CONFIG_DATA_WORKSPACE_DEST)
116+
ls $(params.CONFIG_DATA_WORKSPACE_DEST)
117+
echo Copied config map file with key $(params.CONFIG_MAP_KEY_VALUE) to $(params.CONFIG_DATA_WORKSPACE_DEST)
102118
BUILD_ARGS=()
103119
for buildarg in "$@"
104120
do
@@ -122,8 +138,17 @@ spec:
122138
volumeMounts:
123139
- name: varlibcontainers
124140
mountPath: /var/lib/containers
141+
- name: "conf-$(params.CONFIG_MAP_NAME)"
142+
mountPath: /var/conf/confmap.conf
143+
subPath: confmap.conf
125144
securityContext:
126145
privileged: true
127146
volumes:
128147
- name: varlibcontainers
129148
emptyDir: {}
149+
- name: "conf-$(params.CONFIG_MAP_NAME)"
150+
configMap:
151+
name: "$(params.CONFIG_MAP_NAME)"
152+
items:
153+
- key: $(params.CONFIG_MAP_KEY_VALUE)
154+
path: confmap.conf

.tekton/pipeline.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ spec:
5252
value: "false"
5353
- name: TLSVERIFY
5454
value: "false"
55+
- name: CONFIG_MAP_NAME
56+
value: "next-config"
57+
- name: CONFIG_DATA_WORKSPACE_DEST
58+
value: "./.env"
5559
runAfter:
5660
- git-clone
5761
taskRef:

k8s/config.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ kind: ConfigMap
33
metadata:
44
name: next-config
55
data:
6-
NEXT_PUBLIC_SUPABASE_URL: <SUBSTITUTE -> SUPABASE_URL>
7-
NEXT_PUBLIC_SUPABASE_ANON_KEY: <SUBSTITUTE ->SUPABASE_ANON_KEY>
8-
NEXT_PUBLIC_SITE_URL: <SUBSTITUTE -> SITE_URL>
9-
# NEXT_PUBLIC_HOSTED_DOMAIN: <OPTIONAL-INSERT WHICH DOMAIN NAME FOR GOOGLE AUTH FLOW>
10-
NEXT_PUBLIC_ORGANIZATION_NAME: <SUBSTITUTE -> ORG HUMAN READABLE NAME
6+
# .env: |
7+
# NEXT_PUBLIC_SUPABASE_URL: <SUBSTITUTE -> SUPABASE_URL>
8+
# NEXT_PUBLIC_SUPABASE_ANON_KEY: <SUBSTITUTE ->SUPABASE_ANON_KEY>
9+
# NEXT_PUBLIC_SITE_URL: <SUBSTITUTE -> SITE_URL>
10+
# # NEXT_PUBLIC_HOSTED_DOMAIN: <OPTIONAL-INSERT WHICH DOMAIN NAME FOR GOOGLE AUTH FLOW>
11+
# NEXT_PUBLIC_ORGANIZATION_NAME: <SUBSTITUTE -> ORG HUMAN READABLE NAME
1112
immutable: true

k8s/deployment.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ spec:
3030
envFrom:
3131
- secretRef:
3232
name: next-secret
33-
- configMapRef:
34-
name: next-config
3533
# - name: DATABASE_URI
3634
# valueFrom:
3735
# secretKeyRef:
@@ -48,3 +46,14 @@ spec:
4846
requests:
4947
cpu: "0.25"
5048
memory: "64Mi"
49+
volumeMounts:
50+
- name: config-volume
51+
mountPath: /app/.env
52+
subPath: .env
53+
volumes:
54+
- name: config-volume
55+
configMap:
56+
name: next-config
57+
items:
58+
- key: .env
59+
path: .env

0 commit comments

Comments
 (0)