Skip to content

Commit fb3c4fb

Browse files
the-simmonIlyesbdlala
authored andcommitted
Fix upgrading.md after rebase
Signed-off-by: Simon Hülkenberg <simon.huelkenberg@iteratec.com>
1 parent a8ee6e8 commit fb3c4fb

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

‎UPGRADING.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,10 @@ helm upgrade --install nmap secureCodeBox/nmap --set=cascadingRules.enabled=true
152152
➡️ [Reference: #1347](https://github.com/secureCodeBox/secureCodeBox/pull/1347)
153153

154154

155-
<<<<<<< HEAD
156155
### Service Autodiscovery - Managed-by label assumed to be presented for all scans
157156
Old versions of the operator did not set `app.kubernetes.io/managed-by` label. Starting with V4 the service autodiscovery will assume every scheduled scan created by the autodiscovery will have this label. This means that older scheduled scans without the label will not be detected by the service autodiscovery and new duplicate scheduled scans will be created. Old scheduled scans without the `app.kubernetes.io/managed-by` label must be deleted manually.
158157
➡️ [Reference: #1349](https://github.com/secureCodeBox/secureCodeBox/pull/1349)
159-
=======
160158
### Rename host to hostname in zap findings
161159
The `zap` and `zap-advanced` parsers where changed to increase the consistency between the different SCB scanners. The `zap` and `zap-advanced` findings will now report `host` as `hostname`.
162160

163161
➡️ [Reference: #1346](https://github.com/secureCodeBox/secureCodeBox/pull/1346)
164-
>>>>>>> 31afea97 (Add upgradign section)

0 commit comments

Comments
 (0)