Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆ Bump urllib3 from 1.26.15 to 1.26.17 #1078

Merged
merged 2 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/operators/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12-rc.2
version: 2.0.12-rc.3
6 changes: 3 additions & 3 deletions charts/pelorus/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: exporters
repository: file://./charts/exporters
version: 2.0.12-rc.2
digest: sha256:88a122b606a1b03a63bd0afaf2381b9493aff6fbdb5a97c746216f70db5486db
generated: "2023-09-22T08:45:22.2856204-03:00"
version: 2.0.12-rc.3
digest: sha256:761c37cfbff25227ed3792c013dd8813cfac3671281bdd29da4456eada44953a
generated: "2023-10-05T15:26:24.485233645-03:00"
4 changes: 2 additions & 2 deletions charts/pelorus/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12-rc.2
version: 2.0.12-rc.3

dependencies:
- name: exporters
version: 2.0.12-rc.2
version: 2.0.12-rc.3
repository: file://./charts/exporters
2 changes: 1 addition & 1 deletion charts/pelorus/charts/exporters/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12-rc.2
version: 2.0.12-rc.3
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
value: {{ .image_name }}:{{ .image_tag | default "latest" }}
{{- end }}
{{- else }}
value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12-rc.2" }}
value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12-rc.3" }}
{{- end }}
{{- end }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.12-rc.2" }}
name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12-rc.3" }}
# .image_name
{{- end }}
name: {{ .image_tag | default "stable" }}
Expand Down
6 changes: 3 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,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.15 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305 \
--hash=sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42
urllib3==1.26.17 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \
--hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b
watchdog==3.0.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:0e06ab8858a76e1219e68c7573dfeba9dd1c0219476c5a44d5333b01d7e1743a \
--hash=sha256:13bbbb462ee42ec3c5723e1205be8ced776f05b100e4737518c67c8325cf6100 \
Expand Down
6 changes: 3 additions & 3 deletions exporters/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.15 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305 \
--hash=sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42
urllib3==1.26.17 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \
--hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b
uvicorn==0.22.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:79277ae03db57ce7d9aa0567830bbb51d7a612f54d6e1e3e92da3ef24c2c8ed8 \
--hash=sha256:e9434d3bbf05f310e762147f769c9f21235ee118ba2d2bf1155a7196448bd996
Expand Down
2 changes: 1 addition & 1 deletion pelorus-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.9-rc.2
VERSION ?= 0.0.9-rc.3

# 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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ metadata:
capabilities: Basic Install
categories: |
Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
containerImage: quay.io/pelorus/pelorus-operator:0.0.9-rc.2
createdAt: "2023-09-22T11:45:26Z"
containerImage: quay.io/pelorus/pelorus-operator:0.0.9-rc.3
createdAt: "2023-10-05T18:26:29Z"
description: |
Tool that helps IT organizations measure their impact on the overall performance of their organization
operatorframework.io/suggested-namespace: pelorus
operators.operatorframework.io/builder: operator-sdk-v1.28.1
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.9-rc.2
name: pelorus-operator.v0.0.9-rc.3
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -210,27 +210,6 @@ spec:
- clusterroles
verbs:
- '*'
- apiGroups:
- rbac.authorization.k8s.io
resources:
- rolebindings
- roles
verbs:
- '*'
- apiGroups:
- apps.openshift.io
resources:
- deploymentconfigs
verbs:
- '*'
- apiGroups:
- integreatly.org
resources:
- grafanadashboards
- grafanadatasources
- grafanas
verbs:
- '*'
- apiGroups:
- image.openshift.io
resources:
Expand Down Expand Up @@ -260,6 +239,27 @@ spec:
- services
verbs:
- '*'
- apiGroups:
- rbac.authorization.k8s.io
resources:
- rolebindings
- roles
verbs:
- '*'
- apiGroups:
- apps.openshift.io
resources:
- deploymentconfigs
verbs:
- '*'
- apiGroups:
- integreatly.org
resources:
- grafanadashboards
- grafanadatasources
- grafanas
verbs:
- '*'
- apiGroups:
- operators.coreos.com
resources:
Expand Down Expand Up @@ -409,7 +409,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.9-rc.2
image: quay.io/pelorus/pelorus-operator:0.0.9-rc.3
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -511,7 +511,7 @@ spec:
provider:
name: Red Hat
url: https://redhat.com
version: 0.0.9-rc.2
version: 0.0.9-rc.3
replaces: pelorus-operator.v0.0.8
skips:
- pelorus-operator.v0.0.8
Expand Down
2 changes: 1 addition & 1 deletion pelorus-operator/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/pelorus/pelorus-operator
newTag: 0.0.9-rc.2
newTag: 0.0.9-rc.3
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
capabilities: Basic Install
categories: |
Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
containerImage: quay.io/pelorus/pelorus-operator:0.0.9-rc.2
containerImage: quay.io/pelorus/pelorus-operator:0.0.9-rc.3
description: |
Tool that helps IT organizations measure their impact on the overall performance of their organization
operatorframework.io/suggested-namespace: pelorus
Expand Down
42 changes: 21 additions & 21 deletions pelorus-operator/config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,6 @@ rules:
resources:
- "clusterrolebindings"
- "clusterroles"
- verbs:
- "*"
apiGroups:
- "rbac.authorization.k8s.io"
resources:
- "rolebindings"
- "roles"
- verbs:
- "*"
apiGroups:
- "apps.openshift.io"
resources:
- "deploymentconfigs"
- verbs:
- "*"
apiGroups:
- "integreatly.org"
resources:
- "grafanadashboards"
- "grafanadatasources"
- "grafanas"
- verbs:
- "*"
apiGroups:
Expand Down Expand Up @@ -102,5 +81,26 @@ rules:
- "secrets"
- "serviceaccounts"
- "services"
- verbs:
- "*"
apiGroups:
- "rbac.authorization.k8s.io"
resources:
- "rolebindings"
- "roles"
- verbs:
- "*"
apiGroups:
- "apps.openshift.io"
resources:
- "deploymentconfigs"
- verbs:
- "*"
apiGroups:
- "integreatly.org"
resources:
- "grafanadashboards"
- "grafanadatasources"
- "grafanas"

#+kubebuilder:scaffold:rules
6 changes: 3 additions & 3 deletions pelorus-operator/helm-charts/pelorus/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: exporters
repository: file://./charts/exporters
version: 2.0.12-rc.2
digest: sha256:88a122b606a1b03a63bd0afaf2381b9493aff6fbdb5a97c746216f70db5486db
generated: "2023-09-22T08:45:22.435639172-03:00"
version: 2.0.12-rc.3
digest: sha256:761c37cfbff25227ed3792c013dd8813cfac3671281bdd29da4456eada44953a
generated: "2023-10-05T15:26:24.82893261-03:00"
4 changes: 2 additions & 2 deletions pelorus-operator/helm-charts/pelorus/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
dependencies:
- name: exporters
repository: file://./charts/exporters
version: 2.0.12-rc.2
version: 2.0.12-rc.3
description: A Helm chart for Kubernetes
name: pelorus
type: application
version: 2.0.12-rc.2
version: 2.0.12-rc.3
Original file line number Diff line number Diff line change
Expand Up @@ -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.12-rc.2
version: 2.0.12-rc.3
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
value: {{ .image_name }}:{{ .image_tag | default "latest" }}
{{- end }}
{{- else }}
value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12-rc.2" }}
value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12-rc.3" }}
{{- end }}
{{- end }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.12-rc.2" }}
name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12-rc.3" }}
# .image_name
{{- end }}
name: {{ .image_tag | default "stable" }}
Expand Down
8 changes: 4 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading