Skip to content

Commit 40adc62

Browse files
garloffgarloff
authored
Merge branch 'main' into feat/add-scs-0007
2 parents aa51c6b + 098b0e7 commit 40adc62

File tree

7 files changed

+27
-17
lines changed

7 files changed

+27
-17
lines changed

‎Standards/scs-0001-v1-sovereign-cloud-standards.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ where the group which has to form the consensus depends on the `track` of the do
189189
Any pull request affecting a document in the Global track MUST NOT be merged
190190
unless approved by a representative of the _Forum SCS-Standards_.
191191

192+
In case there is little or no activity in some team, the SIG Standardization/Certification
193+
can take decisions on behalf of such a team. The SIG will seek alignment with the Project
194+
Board for decisions with large impact to ensure we have the wanted broad alignment.
195+
192196
Supplements may be kept in Draft state, because they are not authoritative.
193197

194198
### Proposal phase

‎Tests/iaas/volume-types/volume-types-check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def main(argv):
142142
f"{c[logging.CRITICAL]} / {c[logging.ERROR]} / {c[logging.WARNING]}"
143143
)
144144
if not c[logging.CRITICAL]:
145-
print("volume-types-check: " + ('PASS', 'FAIL')[min(1, c[logging.ERROR])])
145+
print("volume-types-check: " + ('PASS', 'FAIL')[min(1, c[logging.ERROR] + c[logging.WARNING])])
146146
return min(127, c[logging.CRITICAL] + c[logging.ERROR]) # cap at 127 due to OS restrictions
147147

148148

‎Tests/kaas/kaas-sonobuoy-tests/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module kaas/kaas-sonobuoy-tests
22

3-
go 1.21
3+
go 1.23.0
44

55
require (
66
github.com/sirupsen/logrus v1.7.0
@@ -31,11 +31,11 @@ require (
3131
github.com/spf13/pflag v1.0.5 // indirect
3232
github.com/vladimirvivien/gexe v0.1.1 // indirect
3333
github.com/vmware-tanzu/sonobuoy v1.11.5-prerelease.1.0.20211004145628-b633b4fefcdc // indirect
34-
golang.org/x/net v0.33.0 // indirect
34+
golang.org/x/net v0.38.0 // indirect
3535
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
36-
golang.org/x/sys v0.28.0 // indirect
37-
golang.org/x/term v0.27.0 // indirect
38-
golang.org/x/text v0.21.0 // indirect
36+
golang.org/x/sys v0.31.0 // indirect
37+
golang.org/x/term v0.30.0 // indirect
38+
golang.org/x/text v0.23.0 // indirect
3939
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
4040
google.golang.org/appengine v1.6.7 // indirect
4141
google.golang.org/protobuf v1.33.0 // indirect

‎Tests/kaas/kaas-sonobuoy-tests/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
506506
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
507507
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
508508
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
509-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
510-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
509+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
510+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
511511
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
512512
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
513513
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -570,23 +570,23 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
570570
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
571571
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
572572
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
573-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
574-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
573+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
574+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
575575
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
576576
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
577577
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
578578
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
579-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
580-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
579+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
580+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
581581
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
582582
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
583583
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
584584
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
585585
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
586586
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
587587
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
588-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
589-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
588+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
589+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
590590
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
591591
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
592592
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎Tests/scs-compatible-iaas.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ modules:
125125
args: -c {os_cloud} -d
126126
testcases:
127127
- id: volume-types-check
128-
tags: [mandatory]
128+
tags: [volume-types-check]
129129
description: >
130130
Must fulfill all requirements of <https://docs.scs.community/standards/scs-0114-v1-volume-type-standard>
131131
- id: scs-0115-v1

‎compliance-monitor/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.env

‎compliance-monitor/docker-compose.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ services:
2020
volumes:
2121
- /var/run/docker.sock:/var/run/docker.sock
2222
- ./acme:/acme
23+
restart: always
24+
2325
web:
2426
build: .
2527
ports:
@@ -28,7 +30,7 @@ services:
2830
- SCM_DB_HOST=postgres
2931
- SCM_DB_PORT=5432
3032
- SCM_DB_PASSWORD_FILE=/run/secrets/db_password
31-
# pass the following two from the shell
33+
# pass the following two from the shell or put them into .env
3234
- SCM_HC_USER
3335
- SCM_HC_PASSWORD
3436
- SCM_BASE_URL=https://compliance.sovereignit.cloud/
@@ -45,8 +47,10 @@ services:
4547
- traefik.http.routers.websecure.tls.certresolver=myresolver
4648
secrets:
4749
- db_password
50+
restart: always
51+
4852
postgres:
49-
image: postgres
53+
image: postgres:16
5054
volumes:
5155
- $HOME/data:/var/lib/postgresql/data
5256
environment:
@@ -58,6 +62,7 @@ services:
5862
labels:
5963
# do not publish this service publicly
6064
- "traefik.http.routers.postgres.entrypoints=traefik"
65+
restart: always
6166

6267
secrets:
6368
db_password:

0 commit comments

Comments
 (0)