From 8d7b072e3e6df784e2e09727a36fa9256f9b1e4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:18:17 -0400 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=20Bump=20urllib3=20from=201.26.17=20t?= =?UTF-8?q?o=201.26.19=20(#1164)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dependabot[bot] Signed-off-by: Eric Sauer Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Eric Sauer --- _test/prometheus/test.yaml | 4 +-- charts/operators/Chart.yaml | 2 +- charts/pelorus/Chart.lock | 6 ++-- charts/pelorus/Chart.yaml | 4 +-- charts/pelorus/charts/exporters/Chart.yaml | 2 +- .../exporters/templates/_deployment.yaml | 4 +-- .../templates/_imagestream_from_image.yaml | 2 +- docs/requirements.txt | 6 ++-- exporters/requirements.txt | 6 ++-- pelorus-operator/Makefile | 2 +- ...elorus-operator.clusterserviceversion.yaml | 36 +++++++++---------- .../config/manager/kustomization.yaml | 2 +- ...elorus-operator.clusterserviceversion.yaml | 2 +- pelorus-operator/config/rbac/role.yaml | 26 +++++++------- .../helm-charts/pelorus/Chart.lock | 6 ++-- .../helm-charts/pelorus/Chart.yaml | 4 +-- .../pelorus/charts/exporters/Chart.yaml | 2 +- .../exporters/templates/_deployment.yaml | 4 +-- .../templates/_imagestream_from_image.yaml | 2 +- poetry.lock | 8 ++--- 20 files changed, 65 insertions(+), 65 deletions(-) diff --git a/_test/prometheus/test.yaml b/_test/prometheus/test.yaml index f90f7eb5..d0187c8d 100644 --- a/_test/prometheus/test.yaml +++ b/_test/prometheus/test.yaml @@ -434,11 +434,11 @@ tests: exp_samples: [] # Tests for Change Failure Rate - Current interval in charts/pelorus/templates/dashboard-sdp-byapp.yaml - - expr: avg(avg_over_time(sdp:change_failure_rate:by_app{app=~".*/group/.*"} [5m])) + - expr: round(avg(avg_over_time(sdp:change_failure_rate:by_app{app=~".*/group/.*"} [5m])), .001) eval_time: 1m exp_samples: - labels: '{}' - value: 0.5555555555555556 + value: 0.556 - expr: avg(avg_over_time(sdp:change_failure_rate:by_app{app=~".*/subgroup/.*"} [5m])) eval_time: 1m exp_samples: diff --git a/charts/operators/Chart.yaml b/charts/operators/Chart.yaml index abbb03d1..3714178a 100644 --- a/charts/operators/Chart.yaml +++ b/charts/operators/Chart.yaml @@ -14,4 +14,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.0.13-rc.4 +version: 2.0.13-rc.5 diff --git a/charts/pelorus/Chart.lock b/charts/pelorus/Chart.lock index b0cee45b..afe6b2ce 100644 --- a/charts/pelorus/Chart.lock +++ b/charts/pelorus/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: exporters repository: file://./charts/exporters - version: 2.0.13-rc.4 -digest: sha256:9044a4123b267fb9c42945ced5af31fcc02d8ff2000057662fbb40f72b027884 -generated: "2024-09-09T15:49:18.189990808Z" + version: 2.0.13-rc.5 +digest: sha256:8e2357c1c6a1dd97e1875e6faa59cfa04480ed10fa6b96aee01ed00df4fb0b94 +generated: "2024-09-11T14:40:09.478494302Z" diff --git a/charts/pelorus/Chart.yaml b/charts/pelorus/Chart.yaml index ad36e312..f53ec195 100644 --- a/charts/pelorus/Chart.yaml +++ b/charts/pelorus/Chart.yaml @@ -14,9 +14,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.0.13-rc.4 +version: 2.0.13-rc.5 dependencies: - name: exporters - version: 2.0.13-rc.4 + version: 2.0.13-rc.5 repository: file://./charts/exporters diff --git a/charts/pelorus/charts/exporters/Chart.yaml b/charts/pelorus/charts/exporters/Chart.yaml index 8d2b6ccb..b293ce6b 100644 --- a/charts/pelorus/charts/exporters/Chart.yaml +++ b/charts/pelorus/charts/exporters/Chart.yaml @@ -14,4 +14,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.0.13-rc.4 +version: 2.0.13-rc.5 diff --git a/charts/pelorus/charts/exporters/templates/_deployment.yaml b/charts/pelorus/charts/exporters/templates/_deployment.yaml index 6da92611..72e9f463 100644 --- a/charts/pelorus/charts/exporters/templates/_deployment.yaml +++ b/charts/pelorus/charts/exporters/templates/_deployment.yaml @@ -30,7 +30,7 @@ spec: containers: - name: {{ .app_name }} imagePullPolicy: Always - image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.4" }} + image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }} volumeMounts: {{- range $config := .custom_certs }} - name: custom-cert-volume-{{$config.map_name}} @@ -62,7 +62,7 @@ spec: value: {{ .image_name }}:{{ .image_tag | default "latest" }} {{- end }} {{- else }} - value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.4" }} + value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }} {{- end }} {{- end }} diff --git a/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml b/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml index 235c0ba3..7c8da34e 100644 --- a/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml +++ b/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml @@ -23,7 +23,7 @@ spec: name: {{ .image_name }}:{{ .image_tag | default "latest" }} {{- end }} {{- else }} - name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.4" }} + name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }} # .image_name {{- end }} name: {{ .image_tag | default "stable" }} diff --git a/docs/requirements.txt b/docs/requirements.txt index 02b6d03d..3f9e9b96 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -496,9 +496,9 @@ typed-ast==1.5.4 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6 \ --hash=sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3 \ --hash=sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66 -urllib3==1.26.17 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ - --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b +urllib3==1.26.19 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3 \ + --hash=sha256:3e3d753a8618b86d7de333b4223005f68720bcd6a7d2bcb9fbd2229ec7c1e429 watchdog==3.0.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0e06ab8858a76e1219e68c7573dfeba9dd1c0219476c5a44d5333b01d7e1743a \ --hash=sha256:13bbbb462ee42ec3c5723e1205be8ced776f05b100e4737518c67c8325cf6100 \ diff --git a/exporters/requirements.txt b/exporters/requirements.txt index ada816f1..aad72166 100644 --- a/exporters/requirements.txt +++ b/exporters/requirements.txt @@ -393,9 +393,9 @@ starlette==0.26.1 ; python_version >= "3.9" and python_version < "4.0" \ typing-extensions==4.5.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb \ --hash=sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4 -urllib3==1.26.17 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ - --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b +urllib3==1.26.19 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3 \ + --hash=sha256:3e3d753a8618b86d7de333b4223005f68720bcd6a7d2bcb9fbd2229ec7c1e429 uvicorn==0.22.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:79277ae03db57ce7d9aa0567830bbb51d7a612f54d6e1e3e92da3ef24c2c8ed8 \ --hash=sha256:e9434d3bbf05f310e762147f769c9f21235ee118ba2d2bf1155a7196448bd996 diff --git a/pelorus-operator/Makefile b/pelorus-operator/Makefile index 4f19e830..1a1a9664 100644 --- a/pelorus-operator/Makefile +++ b/pelorus-operator/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.0.10-rc.4 +VERSION ?= 0.0.10-rc.5 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml index 17020b91..8394e161 100644 --- a/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml +++ b/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml @@ -49,8 +49,8 @@ metadata: capabilities: Basic Install categories: | Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery - containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.4 - createdAt: "2024-09-10T13:59:23Z" + containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.5 + createdAt: "2024-09-11T14:40:10Z" description: | Tool that helps IT organizations measure their impact on the overall performance of their organization operatorframework.io/suggested-namespace: pelorus @@ -58,7 +58,7 @@ metadata: operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1 repository: https://github.com/dora-metrics/pelorus/ support: Pelorus Community - name: pelorus-operator.v0.0.10-rc.4 + name: pelorus-operator.v0.0.10-rc.5 namespace: placeholder spec: apiservicedefinitions: {} @@ -210,19 +210,6 @@ spec: - clusterroles verbs: - '*' - - apiGroups: - - rbac.authorization.k8s.io - resources: - - rolebindings - - roles - verbs: - - '*' - - apiGroups: - - apps - resources: - - deployments - verbs: - - '*' - apiGroups: - image.openshift.io resources: @@ -252,6 +239,19 @@ spec: - services verbs: - '*' + - apiGroups: + - rbac.authorization.k8s.io + resources: + - rolebindings + - roles + verbs: + - '*' + - apiGroups: + - apps + resources: + - deployments + verbs: + - '*' - apiGroups: - operators.coreos.com resources: @@ -385,7 +385,7 @@ spec: - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - --leader-election-id=pelorus-operator - image: quay.io/pelorus/pelorus-operator:0.0.10-rc.4 + image: quay.io/pelorus/pelorus-operator:0.0.10-rc.5 livenessProbe: httpGet: path: /healthz @@ -487,7 +487,7 @@ spec: provider: name: Red Hat url: https://redhat.com - version: 0.0.10-rc.4 + version: 0.0.10-rc.5 replaces: pelorus-operator.v0.0.9 skips: - pelorus-operator.v0.0.9 diff --git a/pelorus-operator/config/manager/kustomization.yaml b/pelorus-operator/config/manager/kustomization.yaml index 8bc835cb..a28eaa8a 100644 --- a/pelorus-operator/config/manager/kustomization.yaml +++ b/pelorus-operator/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/pelorus/pelorus-operator - newTag: 0.0.10-rc.4 + newTag: 0.0.10-rc.5 diff --git a/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml index 883d218c..8d213f96 100644 --- a/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml +++ b/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml @@ -6,7 +6,7 @@ metadata: capabilities: Basic Install categories: | Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery - containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.4 + containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.5 description: | Tool that helps IT organizations measure their impact on the overall performance of their organization operatorframework.io/suggested-namespace: pelorus diff --git a/pelorus-operator/config/rbac/role.yaml b/pelorus-operator/config/rbac/role.yaml index 434b7658..e381d665 100644 --- a/pelorus-operator/config/rbac/role.yaml +++ b/pelorus-operator/config/rbac/role.yaml @@ -52,19 +52,6 @@ rules: resources: - "clusterrolebindings" - "clusterroles" -- verbs: - - "*" - apiGroups: - - "rbac.authorization.k8s.io" - resources: - - "rolebindings" - - "roles" -- verbs: - - "*" - apiGroups: - - "apps" - resources: - - "deployments" - verbs: - "*" apiGroups: @@ -94,5 +81,18 @@ rules: - "secrets" - "serviceaccounts" - "services" +- verbs: + - "*" + apiGroups: + - "rbac.authorization.k8s.io" + resources: + - "rolebindings" + - "roles" +- verbs: + - "*" + apiGroups: + - "apps" + resources: + - "deployments" #+kubebuilder:scaffold:rules diff --git a/pelorus-operator/helm-charts/pelorus/Chart.lock b/pelorus-operator/helm-charts/pelorus/Chart.lock index 38fd4fba..fa895dd6 100644 --- a/pelorus-operator/helm-charts/pelorus/Chart.lock +++ b/pelorus-operator/helm-charts/pelorus/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: exporters repository: file://./charts/exporters - version: 2.0.13-rc.4 -digest: sha256:9044a4123b267fb9c42945ced5af31fcc02d8ff2000057662fbb40f72b027884 -generated: "2024-09-10T13:59:23.151180653Z" + version: 2.0.13-rc.5 +digest: sha256:8e2357c1c6a1dd97e1875e6faa59cfa04480ed10fa6b96aee01ed00df4fb0b94 +generated: "2024-09-11T14:40:09.706222738Z" diff --git a/pelorus-operator/helm-charts/pelorus/Chart.yaml b/pelorus-operator/helm-charts/pelorus/Chart.yaml index 745b896b..c684c4b3 100644 --- a/pelorus-operator/helm-charts/pelorus/Chart.yaml +++ b/pelorus-operator/helm-charts/pelorus/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 dependencies: - name: exporters repository: file://./charts/exporters - version: 2.0.13-rc.4 + version: 2.0.13-rc.5 description: A Helm chart for Kubernetes name: pelorus type: application -version: 2.0.13-rc.4 +version: 2.0.13-rc.5 diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml index 8d2b6ccb..b293ce6b 100644 --- a/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml +++ b/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml @@ -14,4 +14,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.0.13-rc.4 +version: 2.0.13-rc.5 diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deployment.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deployment.yaml index 6da92611..72e9f463 100644 --- a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deployment.yaml +++ b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deployment.yaml @@ -30,7 +30,7 @@ spec: containers: - name: {{ .app_name }} imagePullPolicy: Always - image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.4" }} + image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }} volumeMounts: {{- range $config := .custom_certs }} - name: custom-cert-volume-{{$config.map_name}} @@ -62,7 +62,7 @@ spec: value: {{ .image_name }}:{{ .image_tag | default "latest" }} {{- end }} {{- else }} - value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.4" }} + value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }} {{- end }} {{- end }} diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml index 235c0ba3..7c8da34e 100644 --- a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml +++ b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml @@ -23,7 +23,7 @@ spec: name: {{ .image_name }}:{{ .image_tag | default "latest" }} {{- end }} {{- else }} - name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.4" }} + name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }} # .image_name {{- end }} name: {{ .image_tag | default "stable" }} diff --git a/poetry.lock b/poetry.lock index 3fa388d4..15c4cf56 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2215,13 +2215,13 @@ files = [ [[package]] name = "urllib3" -version = "1.26.17" +version = "1.26.19" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ - {file = "urllib3-1.26.17-py2.py3-none-any.whl", hash = "sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b"}, - {file = "urllib3-1.26.17.tar.gz", hash = "sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21"}, + {file = "urllib3-1.26.19-py2.py3-none-any.whl", hash = "sha256:37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3"}, + {file = "urllib3-1.26.19.tar.gz", hash = "sha256:3e3d753a8618b86d7de333b4223005f68720bcd6a7d2bcb9fbd2229ec7c1e429"}, ] [package.extras]