Skip to content

Commit 440f907

Browse files
fix(scheduler): resolved CrashLoopBackOff issue and updated web deployment causing connectivity issue
1 parent 1af934a commit 440f907

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

Db.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dbname=fossology;
2+
host=db;
3+
user=fossy;
4+
password=fossy;
5+
client_encoding=utf8;

debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fossology (3.11.0~rc2-1) unstable; urgency=low
1+
fossology (3.11.0~rc1-1) unstable; urgency=low
22

33
* New upstream release
44
* https://github.com/fossology/fossology/releases/tag/3.11.0-rc2 for details

k8s/00-configmap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ metadata:
1515
labels:
1616
app: fossology
1717
data:
18-
FOSSOLOGY_DB_HOST: db
19-
FOSSOLOGY_SCHEDULER_HOST: scheduler
18+
FOSSOLOGY_DB_HOST: db.default.svc.cluster.local
19+
FOSSOLOGY_SCHEDULER_HOST: scheduler.default.svc.cluster.local

k8s/11-scheduler-deployment.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4+
name: scheduler
45
labels:
56
app: scheduler
6-
name: scheduler
77
spec:
88
replicas: 1
99
selector:
@@ -13,16 +13,18 @@ spec:
1313
type: Recreate
1414
template:
1515
metadata:
16-
1716
labels:
1817
app: scheduler
1918
spec:
2019
hostname: scheduler
2120
subdomain: svc
2221
serviceAccountName: internal-kubectl
2322
containers:
24-
- args:
25-
- scheduler
23+
- name: scheduler
24+
image: fossology/scheduler:latest
25+
command: ["/fossology/docker-entrypoint.sh", "scheduler"]
26+
ports:
27+
- containerPort: 24693
2628
env:
2729
- name: FOSSOLOGY_DB_HOST
2830
valueFrom:
@@ -44,18 +46,13 @@ spec:
4446
secretKeyRef:
4547
name: db-secret
4648
key: POSTGRES_USER
47-
image: fossology/scheduler:latest
48-
ports:
49-
- containerPort: 24693
5049
imagePullPolicy: IfNotPresent
5150
livenessProbe:
5251
exec:
53-
command:
54-
- "true"
52+
command: ["true"]
5553
failureThreshold: 2
5654
periodSeconds: 5
5755
timeoutSeconds: 5
58-
name: scheduler
5956
resources: {}
6057
volumeMounts:
6158
- mountPath: /srv/fossology/repository/

src/lib/c/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,19 @@ foreach(FO_CLIB_TARGET fossology fossology_cov)
3737
${FO_CWD}/sqlCopy.c
3838
${FO_CWD}/libfossagentref.h)
3939
target_link_libraries(${FO_CLIB_TARGET}
40-
PRIVATE ${glib_LIBRARIES} ${PostgreSQL_LIBRARIES})
40+
PRIVATE ${glib_LIBRARIES} ${PostgreSQL_LIBRARIES} json-c curl)
4141
endforeach()
4242

4343
target_compile_options(fossology_cov PRIVATE ${FO_COV_FLAGS})
4444

4545
foreach(FO_CLIB_EXEC sqlCopyTest fossconfigTest reppath)
4646
add_executable(${FO_CLIB_EXEC} "")
4747
target_sources(${FO_CLIB_EXEC} PRIVATE ${FO_CLIB_EXEC}.c)
48-
target_link_libraries(${FO_CLIB_EXEC} PRIVATE fossology)
48+
target_link_libraries(${FO_CLIB_EXEC}
49+
PRIVATE fossology
50+
json-c
51+
curl
52+
)
4953
target_compile_definitions(${FO_CLIB_EXEC}
5054
PRIVATE
5155
_FILE_OFFSET_BITS=64
@@ -55,6 +59,7 @@ foreach(FO_CLIB_EXEC sqlCopyTest fossconfigTest reppath)
5559
)
5660
endforeach()
5761

62+
5863
target_include_directories(fossology
5964
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
6065

0 commit comments

Comments
 (0)