Merge pull request #516 from gitpod-io/roboquat/automated-dependency-…

…update-main [bot] [main] Automated dependencies update
gitpod-io · Jan 15, 2024 · 9eb72bc · 9eb72bc
2 parents 121a348 + e45302e
commit 9eb72bc
Show file tree

Hide file tree

Showing 23 changed files with 783 additions and 38 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "3a8e90c4c8925b69c9b409a41b66385f90b1d858",
+      "version": "c8b4b168aff7f84d3b10dc9ddc13a381f15a710c",
       "sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
     },
     {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "f55efbd3961d87ca92b50413c751704280a342c9",
+      "version": "fcccc0ddb6f670f1b7c5cfc861e5ded73a11adf7",
       "sum": "0esXnmFvjRSafufNartkazWaWRiJAXe5wu0JxgqN6NU=",
       "name": "gitpod"
     },
@@ -69,8 +69,8 @@
           "subdir": "gen/grafonnet-v10.0.0"
         }
       },
-      "version": "c13ba17a4d342c0cd23ac55fde640c068a41fe6a",
-      "sum": "5qulX9qHmzzXXA/3aKiu0zPVlhUJA+p/pOMd9RgWZwc="
+      "version": "41a43666c3a7c943b83d8fbc5d07eb954f4af753",
+      "sum": "CyoFNgumAaS/DTwOOS52ivSMplsMnuEgNNGBissPgsM="
     },
     {
       "source": {
@@ -79,7 +79,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "5678b1f0820c716183c01d05eb8c2a4290be55f3",
+      "version": "a546eec7cbb119d11c69911ae85bb8b43be07f6a",
       "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
     },
     {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "dbc615a769afc9a6209ed52701338da9061caeb3",
+      "version": "e7fa2f0b3c7606296dba118cc1759e8055f7215b",
       "sum": "OXjgL+7O/ynFt2acZEdUGwIO1LczecOr+s/mIoM2l2A="
     },
     {
@@ -149,7 +149,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "48d3604507e082f4187f39edda9bc22935881a14",
+      "version": "34836082f8fd00b14d05760bade78796f01c24e3",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -160,8 +160,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "48d3604507e082f4187f39edda9bc22935881a14",
-      "sum": "g7GeEiqQvlT4fW4j7Wl1PkSCxpx+bb5jMheskvb7jYU="
+      "version": "34836082f8fd00b14d05760bade78796f01c24e3",
+      "sum": "H4oOKi1Xd9s2cNf4l58NX6Jsleyai8Kp0e0jvccqpds="
     },
     {
       "source": {
@@ -170,7 +170,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "ab2248afa7e53b78c63e577a10649e6ae8b9db2a",
+      "version": "9ed52df5a7023f2f9324cdcee353c655fd968d09",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -181,7 +181,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "d8e2be1e88b3d663a5852f04efd695461e722be4",
+      "version": "f18cd07fff633bc871e8ad270c604f740cd8ab2d",
       "sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg="
     },
     {
@@ -191,7 +191,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "775d955919e56988200f9188b988dd0d855ced2d",
+      "version": "6150e1ca0ede508e56414363cc9062ef522db518",
       "sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=",
       "name": "prometheus"
     },
@@ -213,7 +213,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "8b1e429a870b5266134695d8618e0c47580e704c",
+      "version": "427b9a171ff4effd76b876b3dd48fa96334c7a69",
       "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
       "name": "thanos-mixin"
     },

diff --git a/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: alertmanagerconfigs.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: alertmanagers.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: podmonitors.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: probes.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: prometheuses.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -3536,7 +3536,7 @@ spec:
                     bearerTokenFile:
                       description: "File from which to read bearer token for the URL. \n Deprecated: this will be removed in a future release. Prefer using `authorization`."
                       type: string
-                    enableHttp2:
+                    enableHTTP2:
                       description: Whether to enable HTTP2.
                       type: boolean
                     headers:
@@ -6381,6 +6381,9 @@ spec:
                 description: Total number of non-terminated pods targeted by this Prometheus deployment (their labels match the selector).
                 format: int32
                 type: integer
+              selector:
+                description: The selector used to match the pods targeted by this Prometheus resource.
+                type: string
               shardStatuses:
                 description: The list has one entry per shard. Each entry provides a summary of the shard status.
                 items:
@@ -6415,6 +6418,10 @@ spec:
                 x-kubernetes-list-map-keys:
                 - shardID
                 x-kubernetes-list-type: map
+              shards:
+                description: Shards is the most recently observed number of shards.
+                format: int32
+                type: integer
               unavailableReplicas:
                 description: Total number of unavailable pods targeted by this Prometheus deployment.
                 format: int32
@@ -6436,4 +6443,8 @@ spec:
     served: true
     storage: true
     subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.shards
+        statusReplicasPath: .status.shards
       status: {}
diff --git a/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: prometheusagents.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -2890,7 +2890,7 @@ spec:
                     bearerTokenFile:
                       description: "File from which to read bearer token for the URL. \n Deprecated: this will be removed in a future release. Prefer using `authorization`."
                       type: string
-                    enableHttp2:
+                    enableHTTP2:
                       description: Whether to enable HTTP2.
                       type: boolean
                     headers:
@@ -5344,6 +5344,9 @@ spec:
                 description: Total number of non-terminated pods targeted by this Prometheus deployment (their labels match the selector).
                 format: int32
                 type: integer
+              selector:
+                description: The selector used to match the pods targeted by this Prometheus resource.
+                type: string
               shardStatuses:
                 description: The list has one entry per shard. Each entry provides a summary of the shard status.
                 items:
@@ -5378,6 +5381,10 @@ spec:
                 x-kubernetes-list-map-keys:
                 - shardID
                 x-kubernetes-list-type: map
+              shards:
+                description: Shards is the most recently observed number of shards.
+                format: int32
+                type: integer
               unavailableReplicas:
                 description: Total number of unavailable pods targeted by this Prometheus deployment.
                 format: int32
@@ -5399,4 +5406,8 @@ spec:
     served: true
     storage: true
     subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.shards
+        statusReplicasPath: .status.shards
       status: {}
diff --git a/...-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/...-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.70.0
+    operator.prometheus.io/version: 0.71.0
   name: prometheusrules.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com