Skip to content

Commit d13710e

Browse files
Marco Bergencesmarvin
authored andcommitted
Merge branch 'release/v1.7.0'
2 parents 3ef4909 + 2520055 commit d13710e

19 files changed

+1164
-651
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v1.7.0] - 2025-08-14
11+
### Added
12+
- [#66] Create debugMode-CRs
13+
1014
## [v1.6.0] - 2025-08-08
1115
### Added
1216
- [#64] Create supportArchive-CRs and download the corresponding support archive when created

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ WORKDIR ${WORKDIR}
3131

3232
LABEL maintainer="hello@cloudogu.com" \
3333
NAME="k8s-ces-control" \
34-
VERSION="1.6.0"
34+
VERSION="1.7.0"
3535

3636
COPY --from=backendbuilder /k8s-ces-control/target/k8s-ces-control ${WORKDIR}/k8s-ces-control
3737

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set these to the desired values
22
ARTIFACT_ID=k8s-ces-control
3-
VERSION=1.6.0
3+
VERSION=1.7.0
44
GOTAG=1.24.3
55
STAGE?=production
66
LOG_LEVEL?=info

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ require (
1010
github.com/cloudogu/ces-control-api v1.5.0
1111
github.com/cloudogu/cesapp-lib v0.18.1
1212
github.com/cloudogu/k8s-blueprint-lib v1.3.0
13+
github.com/cloudogu/k8s-debug-mode-cr-lib v0.2.3
1314
github.com/cloudogu/k8s-dogu-operator/v2 v2.3.0
1415
github.com/cloudogu/k8s-registry-lib v0.5.1
1516
github.com/cloudogu/k8s-support-archive-lib v0.2.0
@@ -20,10 +21,10 @@ require (
2021
google.golang.org/grpc v1.71.0
2122
google.golang.org/protobuf v1.36.6
2223
gopkg.in/yaml.v3 v3.0.1
23-
k8s.io/api v0.33.0
24-
k8s.io/apimachinery v0.33.0
25-
k8s.io/client-go v0.33.0
26-
sigs.k8s.io/controller-runtime v0.20.4
24+
k8s.io/api v0.33.3
25+
k8s.io/apimachinery v0.33.3
26+
k8s.io/client-go v0.33.3
27+
sigs.k8s.io/controller-runtime v0.21.0
2728
)
2829

2930
require (
@@ -50,16 +51,15 @@ require (
5051
github.com/hashicorp/errwrap v1.1.0 // indirect
5152
github.com/josharian/intern v1.0.0 // indirect
5253
github.com/json-iterator/go v1.1.12 // indirect
53-
github.com/klauspost/compress v1.17.11 // indirect
5454
github.com/mailru/easyjson v0.9.0 // indirect
5555
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5656
github.com/modern-go/reflect2 v1.0.2 // indirect
5757
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5858
github.com/pkg/errors v0.9.1 // indirect
5959
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
60-
github.com/prometheus/client_golang v1.20.5 // indirect
60+
github.com/prometheus/client_golang v1.22.0 // indirect
6161
github.com/prometheus/client_model v0.6.1 // indirect
62-
github.com/prometheus/common v0.61.0 // indirect
62+
github.com/prometheus/common v0.62.0 // indirect
6363
github.com/prometheus/procfs v0.15.1 // indirect
6464
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6565
github.com/spf13/pflag v1.0.6 // indirect
@@ -78,7 +78,7 @@ require (
7878
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
7979
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8080
gopkg.in/inf.v0 v0.9.1 // indirect
81-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
81+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
8282
k8s.io/klog/v2 v2.130.1 // indirect
8383
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
8484
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect

go.sum

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
66
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
77
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
88
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
9+
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
10+
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
911
github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4mvaOAM=
1012
github.com/bombsimon/logrusr/v2 v2.0.1/go.mod h1:ByVAX+vHdLGAfdroiMg6q0zgq2FODY2lc5YJvzmOJio=
1113
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -14,34 +16,18 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
1416
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1517
github.com/cloudogu/ces-commons-lib v0.2.0 h1:yOEZWFl4W9N3J/6fok4svE3UufK5GQQtyxvwtIF5AdM=
1618
github.com/cloudogu/ces-commons-lib v0.2.0/go.mod h1:4rvR2RTDDaz5a6OZ1fW27G0MOnl5I3ackeiHxt4gn3o=
17-
github.com/cloudogu/ces-control-api v1.3.1-0.20250327091328-888b134803a8 h1:F/dNF0p7spX+dXRACrUnYoZx02ikLn+xV7U6/IiYp9w=
18-
github.com/cloudogu/ces-control-api v1.3.1-0.20250327091328-888b134803a8/go.mod h1:4kKlQppOuNVka0R7Ce+7KBv75c4xgxKOkJTJVXsa6Gs=
19-
github.com/cloudogu/ces-control-api v1.3.1-0.20250721045426-8bd2aa709037 h1:UcYo+TQmN66uvCQ19Mk8I7DBTZbKtKUfkMGwI9lwUyU=
20-
github.com/cloudogu/ces-control-api v1.3.1-0.20250721045426-8bd2aa709037/go.mod h1:4kKlQppOuNVka0R7Ce+7KBv75c4xgxKOkJTJVXsa6Gs=
21-
github.com/cloudogu/ces-control-api v1.3.1-0.20250721093628-4ae4307bc5b0 h1:8Xu4e4xKbi7Q34p+5dMBThQ1E4FLWPpBZ0QLCubKomU=
22-
github.com/cloudogu/ces-control-api v1.3.1-0.20250721093628-4ae4307bc5b0/go.mod h1:4kKlQppOuNVka0R7Ce+7KBv75c4xgxKOkJTJVXsa6Gs=
23-
github.com/cloudogu/ces-control-api v1.3.1-0.20250725143446-229cef433431 h1:isIUpy0oUYLy9qEdKBpPuOe6Y7fGebCv29HO/NsEH28=
24-
github.com/cloudogu/ces-control-api v1.3.1-0.20250725143446-229cef433431/go.mod h1:4kKlQppOuNVka0R7Ce+7KBv75c4xgxKOkJTJVXsa6Gs=
2519
github.com/cloudogu/ces-control-api v1.5.0 h1:r1R1hxclcJCtXziJipDHRfpamQx/XaBkjJDEhz3o4Q4=
2620
github.com/cloudogu/ces-control-api v1.5.0/go.mod h1:4kKlQppOuNVka0R7Ce+7KBv75c4xgxKOkJTJVXsa6Gs=
2721
github.com/cloudogu/cesapp-lib v0.18.1 h1:LMdGktIefm/PuhdPqpLTPvjY1smO06EEGBbRSAaYi7U=
2822
github.com/cloudogu/cesapp-lib v0.18.1/go.mod h1:J05eXFxnz4enZblABlmiVTZaUtJ+LIhlJ2UF6l9jpDw=
2923
github.com/cloudogu/k8s-blueprint-lib v1.3.0 h1:+Ob+O2xaMX+iTSrxK01r8MOoR2EwZ8FLFbXCzOgibzw=
3024
github.com/cloudogu/k8s-blueprint-lib v1.3.0/go.mod h1:zxwPZqAzWirLRrrtwPcb2+DTW4n+6n8raJIhQrMbN20=
25+
github.com/cloudogu/k8s-debug-mode-cr-lib v0.2.3 h1:8sftEGNt8NzOdMX23tMGWCwr3mXVCQE9ERBRwQfPnzw=
26+
github.com/cloudogu/k8s-debug-mode-cr-lib v0.2.3/go.mod h1:7FjWsEJ3Goo+Luyx7LYEIweu4+BBpNyDW67oO5F0/kY=
3127
github.com/cloudogu/k8s-dogu-operator/v2 v2.3.0 h1:U2VHM9QwHArm5AYmcfSgzzAbTdgxrk+TqcgTublhNZA=
3228
github.com/cloudogu/k8s-dogu-operator/v2 v2.3.0/go.mod h1:yfvaFn951pWxFMapJmEz2ZPpT5unEOcTwEhspGehNYQ=
3329
github.com/cloudogu/k8s-registry-lib v0.5.1 h1:gbdrhETUm53GP65LoljrS1kekDDl/onBPfrOQTQpt1s=
3430
github.com/cloudogu/k8s-registry-lib v0.5.1/go.mod h1:mdMOgknEOrGQH1zc/3K859iPhwpqwtzigK9QrjM3Vk0=
35-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250721044737-f34164e252cb h1:xXgonsXDgGPntBzrFxIgMSasi8ScBuW/JCpVJi3Ht+M=
36-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250721044737-f34164e252cb/go.mod h1:xgC9bj8Q0rzefinCb7RScQwF/bxcZ2675Slqff3rZcQ=
37-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250725142953-d9add64d4720 h1:tzpALrQbWxEU8j3cW+6FQO99d6KfXiaANqDHu1mdGVU=
38-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250725142953-d9add64d4720/go.mod h1:xgC9bj8Q0rzefinCb7RScQwF/bxcZ2675Slqff3rZcQ=
39-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250725145308-af6dbb624efc h1:eiL1Zw1K74UTzDwEvey+MxyOFPAi8CZk6HKyRyRu3Eo=
40-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250725145308-af6dbb624efc/go.mod h1:xgC9bj8Q0rzefinCb7RScQwF/bxcZ2675Slqff3rZcQ=
41-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250804113354-778ad443943b h1:kDRwcr5HC5X42CwYp60B3yWVxR5mFiC8iLwIz/kmWJE=
42-
github.com/cloudogu/k8s-support-archive-lib v0.0.0-20250804113354-778ad443943b/go.mod h1:xgC9bj8Q0rzefinCb7RScQwF/bxcZ2675Slqff3rZcQ=
43-
github.com/cloudogu/k8s-support-archive-lib v0.1.2 h1:sJt6HAhbxGaEL+pBAZIqC8iNkNaTGCdCReUXMm3P6JY=
44-
github.com/cloudogu/k8s-support-archive-lib v0.1.2/go.mod h1:xgC9bj8Q0rzefinCb7RScQwF/bxcZ2675Slqff3rZcQ=
4531
github.com/cloudogu/k8s-support-archive-lib v0.2.0 h1:Vjt+finSvJo9qAQQ099h6kcPCk0/0g0E/+OYucKEWkw=
4632
github.com/cloudogu/k8s-support-archive-lib v0.2.0/go.mod h1:xgC9bj8Q0rzefinCb7RScQwF/bxcZ2675Slqff3rZcQ=
4733
github.com/cloudogu/retry-lib v0.1.0 h1:gaAmtyjUqgHbxfCWMeUn0qnGbDH4TtZVSQkbZ1Nq6eI=
@@ -129,8 +115,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
129115
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
130116
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
131117
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
132-
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
133-
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
118+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
119+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
134120
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
135121
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
136122
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -184,12 +170,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
184170
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
185171
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
186172
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
187-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
188-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
173+
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
174+
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
189175
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
190176
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
191-
github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
192-
github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
177+
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
178+
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
193179
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
194180
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
195181
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -234,8 +220,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
234220
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
235221
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
236222
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
237-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
238-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
223+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
224+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
239225
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
240226
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
241227
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
@@ -320,22 +306,22 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
320306
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
321307
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
322308
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
323-
k8s.io/api v0.33.0 h1:yTgZVn1XEe6opVpP1FylmNrIFWuDqe2H0V8CT5gxfIU=
324-
k8s.io/api v0.33.0/go.mod h1:CTO61ECK/KU7haa3qq8sarQ0biLq2ju405IZAd9zsiM=
325-
k8s.io/apiextensions-apiserver v0.32.3 h1:4D8vy+9GWerlErCwVIbcQjsWunF9SUGNu7O7hiQTyPY=
326-
k8s.io/apiextensions-apiserver v0.32.3/go.mod h1:8YwcvVRMVzw0r1Stc7XfGAzB/SIVLunqApySV5V7Dss=
327-
k8s.io/apimachinery v0.33.0 h1:1a6kHrJxb2hs4t8EE5wuR/WxKDwGN1FKH3JvDtA0CIQ=
328-
k8s.io/apimachinery v0.33.0/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
329-
k8s.io/client-go v0.33.0 h1:UASR0sAYVUzs2kYuKn/ZakZlcs2bEHaizrrHUZg0G98=
330-
k8s.io/client-go v0.33.0/go.mod h1:kGkd+l/gNGg8GYWAPr0xF1rRKvVWvzh9vmZAMXtaKOg=
309+
k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
310+
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
311+
k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs=
312+
k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc=
313+
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
314+
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
315+
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
316+
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
331317
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
332318
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
333319
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
334320
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
335321
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
336322
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
337-
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
338-
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
323+
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
324+
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
339325
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
340326
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
341327
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

interfaces.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"github.com/cloudogu/k8s-ces-control/packages/doguAdministration"
5+
debugClientV1 "github.com/cloudogu/k8s-debug-mode-cr-lib/pkg/client/v1"
56
ecoSystemV2 "github.com/cloudogu/k8s-dogu-operator/v2/api/ecoSystem"
67
supClientV1 "github.com/cloudogu/k8s-support-archive-lib/client/v1"
78
"k8s.io/client-go/kubernetes"
@@ -34,4 +35,5 @@ type clusterClient interface {
3435
doguAdministration.BlueprintLister
3536
kubernetes.Interface
3637
supClientV1.SupportArchiveV1Interface
38+
debugClientV1.DebugModeV1Interface
3739
}

k8s/helm/component-patch-tpl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
values:
33
images:
4-
cesControl: cloudogu/k8s-ces-control:1.6.0
4+
cesControl: cloudogu/k8s-ces-control:1.7.0
55
patches:
66
values.yaml:
77
manager:

k8s/helm/templates/dogu-debug-mode-role.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@ rules:
3232
- dogurestarts
3333
verbs:
3434
- create
35+
- apiGroups:
36+
- k8s.cloudogu.com
37+
resources:
38+
- debugmodes
39+
verbs:
40+
- update
41+
- create
42+
- get

k8s/helm/templates/networkpolicies.yaml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,33 @@ spec:
5050
namespaceSelector:
5151
matchLabels:
5252
kubernetes.io/metadata.name: {{ $.Release.Namespace }}
53+
---
54+
apiVersion: networking.k8s.io/v1
55+
kind: NetworkPolicy
56+
metadata:
57+
name: {{ printf "%s-debug-mode-ingress" (include "k8s-ces-control.name" .) | trunc 63 | trimSuffix "-" }}
58+
namespace: {{ $.Release.Namespace }}
59+
labels:
60+
{{- include "k8s-ces-control.labels" . | nindent 4 }}
61+
spec:
62+
podSelector:
63+
matchLabels:
64+
app: ces
65+
app.kubernetes.io/name: k8s-debug-mode-operator
66+
policyTypes:
67+
- Ingress
68+
ingress:
69+
- from:
70+
- podSelector:
71+
matchLabels:
72+
app: ces
73+
app.kubernetes.io/name: k8s-ces-control
74+
namespaceSelector:
75+
matchLabels:
76+
kubernetes.io/metadata.name: {{ $.Release.Namespace }}
77+
ports:
78+
- protocol: TCP
79+
port: 8080
5380
{{- if .Values.global.networkPolicies.denyIngress }}
5481
---
5582
# This NetworkPolicy denies all ingress to k8s-ces-control.
@@ -68,5 +95,5 @@ spec:
6895
{{- include "k8s-ces-control.selectorLabels" . | nindent 6 }}
6996
policyTypes:
7097
- Ingress
71-
{{- end}}
98+
{{- end }}
7299
{{- end }}

k8s/helm/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager:
88
image:
99
registry: docker.io
1010
repository: cloudogu/k8s-ces-control
11-
tag: 1.6.0
11+
tag: 1.7.0
1212
imagePullPolicy: IfNotPresent
1313
replicas: 1
1414
env:

0 commit comments

Comments
 (0)