Skip to content

Commit 5679250

Browse files
mms-giannimms-gianni
committed
add extra volumes to build container
1 parent c321ba5 commit 5679250

File tree

8 files changed

+20
-174
lines changed

8 files changed

+20
-174
lines changed

‎.github/workflows/docker-build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ on:
1616

1717
env:
1818
SDK_VERSION: "v1.24.0"
19-
# IMG: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.112
20-
# BUNDLE_IMG: ghcr.io/kubero-dev/kubero-operator/kuberoapp-bundle:v0.0.112
19+
# IMG: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.113
20+
# BUNDLE_IMG: ghcr.io/kubero-dev/kubero-operator/kuberoapp-bundle:v0.0.113
2121

2222
jobs:
2323
# Push image to GitHub Packages.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 0.0.112
6+
VERSION ?= 0.0.113
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

‎bundle/manifests/kubero-operator.clusterserviceversion.yaml‎

Lines changed: 6 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -38,134 +38,13 @@ metadata:
3838
},
3939
"kubero": {
4040
"auth": {
41-
"buildpacks": [
42-
{
43-
"build": {
44-
"command": "npm install",
45-
"repository": "node",
46-
"tag": "latest"
47-
},
48-
"fetch": {
49-
"repository": "ghcr.io/kubero-dev/buildpacks/fetch",
50-
"tag": "main"
51-
},
52-
"language": "JavaScript",
53-
"name": "NodeJS",
54-
"run": {
55-
"command": "node index.js",
56-
"repository": "node",
57-
"tag": "latest"
58-
}
59-
},
60-
{
61-
"build": {
62-
"command": "composer install; chown -R 1000:1000 /app",
63-
"repository": "composer",
64-
"tag": "latest"
65-
},
66-
"fetch": {
67-
"repository": "ghcr.io/kubero-dev/buildpacks/fetch",
68-
"tag": "main"
69-
},
70-
"language": "PHP",
71-
"name": "PHP",
72-
"run": {
73-
"command": "apache2-foreground",
74-
"readOnlyAppStorage": false,
75-
"repository": "webdevops/php-apache",
76-
"securityContext": {
77-
"allowPrivilegeEscalation": true,
78-
"readOnlyRootFilesystem": false
79-
},
80-
"tag": "8.1"
81-
}
82-
},
83-
{
84-
"build": {
85-
"command": "python3 -m venv .venv \u0026\u0026 . .venv/bin/activate \u0026\u0026 pip install -r requirements.txt",
86-
"repository": "python",
87-
"tag": "3.10-buster"
88-
},
89-
"fetch": {
90-
"repository": "ghcr.io/kubero-dev/buildpacks/fetch",
91-
"tag": "main"
92-
},
93-
"language": "Python",
94-
"name": "Python",
95-
"run": {
96-
"command": "python3 -m venv .venv \u0026\u0026 . .venv/bin/activate \u0026\u0026 python3 main.py",
97-
"repository": "python",
98-
"tag": "3.10-buster"
99-
}
100-
},
101-
{
102-
"build": {
103-
"command": "go mod download \u0026\u0026 go mod verify \u0026\u0026 go build -v -o app",
104-
"repository": "golang",
105-
"tag": "alpine"
106-
},
107-
"fetch": {
108-
"repository": "ghcr.io/kubero-dev/buildpacks/fetch",
109-
"tag": "main"
110-
},
111-
"language": "GoLang",
112-
"name": "GoLang",
113-
"run": {
114-
"command": "./app",
115-
"repository": "golang",
116-
"tag": "alpine"
117-
}
118-
},
119-
{
120-
"build": {
121-
"command": "export GEM_HOME=/app/bundle; bundle install --jobs=4 --retry=3",
122-
"repository": "ruby",
123-
"tag": "2.7"
124-
},
125-
"fetch": {
126-
"repository": "ghcr.io/kubero-dev/buildpacks/fetch",
127-
"tag": "main"
128-
},
129-
"language": "Ruby",
130-
"name": "Ruby",
131-
"run": {
132-
"command": "export GEM_HOME=/app/bundle; bundle exec ruby main.rb",
133-
"repository": "ruby",
134-
"tag": "2.7"
135-
}
136-
},
137-
{
138-
"build": {
139-
"command": "echo 'Buildpack not required'",
140-
"repository": "busybox",
141-
"tag": "latest"
142-
},
143-
"fetch": {
144-
"repository": "ghcr.io/kubero-dev/buildpacks/fetch",
145-
"tag": "main"
146-
},
147-
"language": "HTML",
148-
"name": "Static",
149-
"run": {
150-
"command": "supervisord",
151-
"repository": "webdevops/nginx",
152-
"tag": "alpine"
153-
}
154-
}
155-
],
156-
"config": "",
15741
"github": {
15842
"callbackUrl": "",
15943
"enabled": false,
16044
"id": "",
16145
"org": "",
16246
"secret": ""
16347
},
164-
"kubero": {
165-
"context": "inClusterContext",
166-
"namespace": "kubero",
167-
"port": 3000
168-
},
16948
"oauth2": {
17049
"authUrl": "",
17150
"callbackUrl": "",
@@ -174,50 +53,9 @@ metadata:
17453
"name": "",
17554
"secret": "",
17655
"tokenUrl": ""
177-
},
178-
"podSizeList": [
179-
{
180-
"default": true,
181-
"description": "Small (CPU: 0.25, Memory: 0.5Gi)",
182-
"name": "small",
183-
"resources": {
184-
"limits": {
185-
"cpu": "500m",
186-
"memory": "1Gi"
187-
},
188-
"requests": {
189-
"cpu": "250m",
190-
"memory": "0.5Gi"
191-
}
192-
}
193-
},
194-
{
195-
"description": "Medium (CPU: 1, Memory: 2Gi)",
196-
"name": "medium",
197-
"resources": {
198-
"limits": {
199-
"cpu": "2000m",
200-
"memory": "4Gi"
201-
},
202-
"requests": {
203-
"cpu": "1000m",
204-
"memory": "2Gi"
205-
}
206-
}
207-
},
208-
{
209-
"active": false,
210-
"description": "Large (CPU: 2, Memory: 4Gi)",
211-
"name": "large",
212-
"resources": {
213-
"requests": {
214-
"cpu": "2000m",
215-
"memory": "4Gi"
216-
}
217-
}
218-
}
219-
]
56+
}
22057
},
58+
"config": "kubero:\n readonly: false\n banner:\n show: false\n message: \"Welcome to Kubero!\"\n bgcolor: \"#8560A9\"\n fontcolor: \"azure\"\nbuildpacks:\n - name: NodeJS\n language: JavaScript\n fetch:\n repository: ghcr.io/kubero-dev/buildpacks/fetch\n tag: main\n build:\n repository: node\n tag: latest\n command: \"npm install\"\n run:\n repository: node\n tag: latest\n command: \"node index.js\"\n - name: PHP\n language: PHP\n fetch:\n repository: ghcr.io/kubero-dev/buildpacks/fetch\n tag: main\n build:\n repository: composer\n tag: latest\n command: \"composer install; chown -R 1000:1000 /app\"\n run:\n repository: webdevops/php-apache\n tag: \"8.1\"\n readOnlyAppStorage: false\n securityContext:\n allowPrivilegeEscalation: true\n readOnlyRootFilesystem: false\n command: \"apache2-foreground\"\n - name: Python\n language: Python\n fetch:\n repository: ghcr.io/kubero-dev/buildpacks/fetch\n tag: main\n build:\n repository: python\n tag: 3.10-buster\n command: \"python3 -m venv .venv \u0026\u0026 . .venv/bin/activate \u0026\u0026 pip install -r requirements.txt\"\n run:\n repository: python\n tag: 3.10-buster\n command: \"python3 -m venv .venv \u0026\u0026 . .venv/bin/activate \u0026\u0026 python3 main.py\"\n - name: GoLang\n language: GoLang\n fetch:\n repository: ghcr.io/kubero-dev/buildpacks/fetch\n tag: main\n build:\n repository: golang\n tag: alpine\n command: \"go mod download \u0026\u0026 go mod verify \u0026\u0026 go build -v -o app\"\n run:\n repository: golang\n tag: alpine\n command: \"./app\"\n - name: Ruby\n language: Ruby\n fetch:\n repository: ghcr.io/kubero-dev/buildpacks/fetch\n tag: main\n build:\n repository: ruby\n tag: \"2.7\"\n command: \"export GEM_HOME=/app/bundle; bundle install --jobs=4 --retry=3\"\n run:\n repository: ruby\n tag: \"2.7\"\n command: \"export GEM_HOME=/app/bundle; bundle exec ruby main.rb\"\n - name: Static\n language: HTML\n fetch:\n repository: ghcr.io/kubero-dev/buildpacks/fetch\n tag: main\n build:\n repository: busybox\n tag: latest\n command: \"echo 'Buildpack not required'\"\n run:\n repository: webdevops/nginx\n tag: alpine\n command: \"supervisord\"\npodSizeList:\n- name: small\n description: 'Small (CPU: 0.25, Memory: 0.5Gi)'\n default: true\n resources:\n requests:\n memory: 0.5Gi\n cpu: 250m\n limits:\n memory: 1Gi\n cpu: 500m\n- name: medium\n description: 'Medium (CPU: 1, Memory: 2Gi)'\n resources:\n requests:\n memory: 2Gi\n cpu: 1000m\n limits:\n memory: 4Gi\n cpu: 2000m\n- name: large\n description: 'Large (CPU: 2, Memory: 4Gi)'\n active: false\n resources:\n requests:\n memory: 4Gi\n cpu: 2000m\n",
22159
"context": "inClusterContext",
22260
"debug": "",
22361
"namespace": "kubero",
@@ -706,13 +544,13 @@ metadata:
706544
capabilities: Basic Install
707545
categories: Integration & Delivery
708546
certified: "false"
709-
containerImage: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.112
547+
containerImage: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.113
710548
description: Kubero is a GitOps continuous delivery tool for Kubernetes.
711549
operators.operatorframework.io/builder: operator-sdk-v1.24.0
712550
operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
713551
repository: https://github.com/kubero-dev/kubero
714552
support: Kubero Community
715-
name: kubero-operator.v0.0.112
553+
name: kubero-operator.v0.0.113
716554
namespace: placeholder
717555
spec:
718556
apiservicedefinitions: {}
@@ -1402,7 +1240,7 @@ spec:
14021240
- --metrics-bind-address=127.0.0.1:8080
14031241
- --leader-elect
14041242
- --leader-election-id=kubero-operator
1405-
image: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.112
1243+
image: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.113
14061244
livenessProbe:
14071245
httpGet:
14081246
path: /healthz
@@ -1489,4 +1327,4 @@ spec:
14891327
provider:
14901328
name: kubero
14911329
url: https://github.com/kubero-dev/
1492-
version: 0.0.112
1330+
version: 0.0.113

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: ghcr.io/kubero-dev/kubero-operator/kuberoapp
16-
newTag: v0.0.112
16+
newTag: v0.0.113

‎config/manifests/bases/kubero-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
capabilities: Basic Install
77
categories: Integration & Delivery
88
certified: "false"
9-
containerImage: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.112
9+
containerImage: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.113
1010
description: Kubero is a GitOps continuous delivery tool for Kubernetes.
1111
repository: https://github.com/kubero-dev/kubero
1212
support: Kubero Community

‎deploy/operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ spec:
11321132
- --metrics-bind-address=127.0.0.1:8080
11331133
- --leader-elect
11341134
- --leader-election-id=kubero-operator
1135-
image: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.112
1135+
image: ghcr.io/kubero-dev/kubero-operator/kuberoapp:v0.0.113
11361136
livenessProbe:
11371137
httpGet:
11381138
path: /healthz

‎helm-charts/kuberoapp/templates/deployment-web.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ spec:
7777
volumeMounts:
7878
- mountPath: /app
7979
name: app-storage
80+
{{- range .Values.extraVolumes }}
81+
- mountPath: {{ .mountPath }}
82+
name: {{ .name }}
83+
{{- end }}
8084
{{- end }}
8185
containers:
8286
- name: {{ .Chart.Name }}-web

‎helm-charts/kuberoapp/templates/deployment-worker.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ spec:
7777
volumeMounts:
7878
- mountPath: /app
7979
name: app-storage
80+
{{- range .Values.extraVolumes }}
81+
- mountPath: {{ .mountPath }}
82+
name: {{ .name }}
83+
{{- end }}
8084
{{- end }}
8185
containers:
8286
- name: {{ .Chart.Name }}-worker

0 commit comments

Comments
 (0)