Skip to content

Commit

Permalink
Merge branch 'main' into remove-excess-permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
@lindnerby
lindnerby authored Feb 24, 2025
2 parents acc120a + e993711 commit 3f47cdc
Show file tree
Hide file tree
Showing 32 changed files with 1,136 additions and 177 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-manifests-changes.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
MAIN_CACHE_KEY: main-manifests-${{ github.run_id }}-${{ github.run_attempt }}

on:
pull_request:
pull_request_target:

jobs:
create-pr-manifests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pipeline-changes.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Check Pipeline Changes"

on:
pull_request:
pull_request_target:

jobs:
check-pipeline-changes:
Expand Down
11 changes: 5 additions & 6 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.23.6
require (
github.com/Masterminds/semver/v3 v3.3.1
github.com/stretchr/testify v1.10.0
k8s.io/apimachinery v0.32.1
sigs.k8s.io/controller-runtime v0.20.1
k8s.io/apimachinery v0.32.2
sigs.k8s.io/controller-runtime v0.20.2
)

require github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand All @@ -32,7 +32,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
Expand All @@ -43,8 +42,8 @@ require (
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.32.1 // indirect
k8s.io/client-go v0.32.1 // indirect
k8s.io/api v0.32.2 // indirect
k8s.io/client-go v0.32.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
Expand Down
32 changes: 16 additions & 16 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
Expand Down Expand Up @@ -57,10 +57,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down Expand Up @@ -132,22 +132,22 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0=
k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw=
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
Expand Down
3 changes: 1 addition & 2 deletions api/shared/operator_labels.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ const (
GlobalAccountIDLabel = KymaGroup + Separator + "global-account-id"
RegionLabel = KymaGroup + Separator + "region"
PlatformRegionLabel = KymaGroup + Separator + "platform-region"
// to be confirmed https://github.com/kyma-project/kyma/issues/18611#issuecomment-2441158676
PlanLabel = KymaGroup + Separator + "broker-plan-name"
PlanLabel = KymaGroup + Separator + "broker-plan-name"

EnableLabelValue = "true"
DisableLabelValue = "false"
Expand Down
1 change: 0 additions & 1 deletion api/v1beta2/kyma_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ func (kyma *Kyma) GetPlatformRegion() string {
return kyma.Labels[shared.PlatformRegionLabel]
}

// to be confirmed https://github.com/kyma-project/kyma/issues/18611#issuecomment-2441158676
func (kyma *Kyma) GetPlan() string {
return kyma.Labels[shared.PlanLabel]
}
122 changes: 108 additions & 14 deletions config/grafana/overview.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -215,7 +215,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -315,7 +315,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -596,7 +596,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 2,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -699,7 +699,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -813,7 +813,7 @@
"showThresholdMarkers": true,
"text": {}
},
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1167,7 +1167,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1277,7 +1277,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1387,7 +1387,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1500,7 +1500,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1622,7 +1622,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 2,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1730,7 +1730,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 2,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1826,7 +1826,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 2,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1920,7 +1920,7 @@
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.29",
"pluginVersion": "7.5.35",
"pointradius": 2,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -1977,6 +1977,100 @@
"align": false,
"alignLevel": null
}
},
{
"collapsed": false,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 110
},
"id": 84,
"panels": [],
"title": "Maintenance Windows",
"type": "row"
},
{
"datasource": null,
"description": "Indicates whether the KLM successfully read the maintenance policy file from the mounted ConfigMap.",
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"mappings": [
{
"from": "",
"id": 1,
"text": "Failed",
"to": "",
"type": 1,
"value": "0"
},
{
"from": "",
"id": 2,
"text": "Success",
"to": "",
"type": 1,
"value": "1"
}
],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "red",
"value": null
},
{
"color": "green",
"value": 1
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 111
},
"id": 86,
"options": {
"colorMode": "background",
"graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"text": {},
"textMode": "auto"
},
"pluginVersion": "7.5.35",
"targets": [
{
"exemplar": true,
"expr": "maintenance_window_config_read_success",
"format": "time_series",
"interval": "",
"legendFormat": "{{pod}}",
"refId": "A"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Maintenance Window Configuration Read Status",
"type": "stat"
}
],
"refresh": "",
Expand Down
2 changes: 1 addition & 1 deletion config/watcher/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ patches:
value: --skr-watcher-path=/skr-webhook
- op: add
path: /spec/template/spec/containers/0/args/-
value: --skr-watcher-image-tag=1.1.10
value: --skr-watcher-image-tag=1.1.11
- op: add
path: /spec/template/spec/containers/0/args/-
value: --skr-watcher-image-registry=europe-docker.pkg.dev/kyma-project/prod
Expand Down
Loading

0 comments on commit 3f47cdc

Please sign in to comment.