feat(container): update image spegel ( 0.1.1 → 0.6.0 )#334
Open
flkr-23[bot] wants to merge 1 commit intomainfrom
Open
feat(container): update image spegel ( 0.1.1 → 0.6.0 )#334flkr-23[bot] wants to merge 1 commit intomainfrom
flkr-23[bot] wants to merge 1 commit intomainfrom
Conversation
Contributor
Author
--- HelmRelease: kube-system/spegel ConfigMap: kube-system/spegel-dashboard
+++ HelmRelease: kube-system/spegel ConfigMap: kube-system/spegel-dashboard
@@ -2,19 +2,67 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: spegel-dashboard
namespace: kube-system
labels:
- grafana_dashboard: '1'
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
app.kubernetes.io/managed-by: Helm
data:
spegel.json: |-
{
+ "__inputs": [
+ {
+ "name": "datasource",
+ "label": "datasource",
+ "description": "",
+ "type": "datasource",
+ "pluginId": "prometheus",
+ "pluginName": "Prometheus"
+ }
+ ],
+ "__elements": {},
+ "__requires": [
+ {
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "11.5.2"
+ },
+ {
+ "type": "datasource",
+ "id": "prometheus",
+ "name": "Prometheus",
+ "version": "1.0.0"
+ },
+ {
+ "type": "panel",
+ "id": "stat",
+ "name": "Stat",
+ "version": ""
+ },
+ {
+ "type": "panel",
+ "id": "table",
+ "name": "Table",
+ "version": ""
+ },
+ {
+ "type": "panel",
+ "id": "text",
+ "name": "Text",
+ "version": ""
+ },
+ {
+ "type": "panel",
+ "id": "timeseries",
+ "name": "Time series",
+ "version": ""
+ }
+ ],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": {
"type": "grafana",
@@ -48,13 +96,12 @@
"w": 24,
"x": 0,
"y": 0
},
"id": 24,
"panels": [],
- "title": "",
"type": "row"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
@@ -99,13 +146,13 @@
"values": false
},
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
@@ -165,13 +212,13 @@
"values": false
},
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
@@ -229,17 +276,18 @@
"values": false
},
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
- "uid": "$datasource"
+ "type": "prometheus",
+ "uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(kubelet_running_containers)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
@@ -295,13 +343,13 @@
"values": false
},
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
@@ -367,38 +415,34 @@
"values": false
},
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"editorMode": "code",
"exemplar": false,
- "expr": "max(rate(http_request_duration_seconds_bucket{job=\"spegel\"}[$__interval]))",
+ "expr": "max(rate(http_request_duration_seconds_bucket{job=\"$job\"}[$__interval]))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
"range": false,
"refId": "A"
}
],
"title": "Max Request Duration",
"transparent": true,
"type": "stat"
},
{
- "fieldConfig": {
- "defaults": {},
- "overrides": []
- },
"gridPos": {
"h": 4,
"w": 3,
"x": 21,
"y": 1
},
@@ -409,13 +453,13 @@
"showLineNumbers": false,
"showMiniMap": false
},
"content": "<br>\n<div style=\"text-align: center;\"><a href=\"https://github.com/XenitAB/spegel\" target=\"_blank\">Spegel at GitHub</a> </div>\n\n",
"mode": "html"
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"title": "Github link",
"transparent": true,
"type": "text"
},
{
"collapsed": false,
@@ -425,13 +469,12 @@
"x": 0,
"y": 5
},
"id": 9,
"panels": [],
"repeat": "datasource",
- "title": "",
"type": "row"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
@@ -509,22 +552,22 @@
"show": false
},
"frameIndex": 0,
"showHeader": true,
"sortBy": []
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"editorMode": "code",
"exemplar": false,
- "expr": "spegel_advertised_images{job=~\"spegel\",instance=~\"$instance\"}",
+ "expr": "spegel_advertised_images{job=~\"$job\",instance=~\"$instance\"}",
"format": "table",
"instant": true,
"legendFormat": "__auto",
"range": false,
"refId": "A"
},
@@ -532,22 +575,21 @@
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"editorMode": "code",
"exemplar": false,
- "expr": "spegel_advertised_keys{job=~\"spegel\",instance=~\"$instance\"} ",
+ "expr": "spegel_advertised_keys{job=~\"$job\",instance=~\"$instance\"} ",
"format": "table",
"hide": false,
"instant": true,
"legendFormat": "__auto",
"range": false,
"refId": "B"
}
],
- "title": "",
"transformations": [
{
"id": "filterFieldsByName",
"options": {
"include": {
"names": [
@@ -656,26 +698,27 @@
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
+ "hideZeros": false,
"mode": "single",
"sort": "none"
}
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"editorMode": "code",
"exemplar": false,
- "expr": "spegel_advertised_images{job=~\"spegel\",instance=~\"$instance\"}",
+ "expr": "spegel_advertised_images{job=~\"$job\",instance=~\"$instance\"}",
"format": "time_series",
"instant": false,
"legendFormat": "{{ instance }}",
"range": true,
"refId": "A"
}
@@ -684,13 +727,13 @@
"transparent": true,
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
- "uid": "$datasource"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
@@ -818,17 +861,18 @@
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": false
},
"tooltip": {
+ "hideZeros": false,
"mode": "multi",
"sort": "none"
}
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"uid": "$datasource"
},
"editorMode": "code",
@@ -920,26 +964,27 @@
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
+ "hideZeros": false,
"mode": "single",
"sort": "none"
}
},
- "pluginVersion": "11.3.0",
+ "pluginVersion": "11.5.2",
"targets": [
{
"datasource": {
"type": "prometheus",
[Diff truncated by flux-local]
--- HelmRelease: kube-system/spegel Service: kube-system/spegel
+++ HelmRelease: kube-system/spegel Service: kube-system/spegel
@@ -8,12 +8,13 @@
app.kubernetes.io/component: metrics
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
app.kubernetes.io/managed-by: Helm
spec:
selector:
+ app.kubernetes.io/component: spegel
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
ports:
- name: metrics
port: 9090
targetPort: metrics
--- HelmRelease: kube-system/spegel Service: kube-system/spegel-registry
+++ HelmRelease: kube-system/spegel Service: kube-system/spegel-registry
@@ -10,12 +10,13 @@
app.kubernetes.io/managed-by: Helm
annotations:
service.kubernetes.io/topology-mode: auto
spec:
type: NodePort
selector:
+ app.kubernetes.io/component: spegel
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
ports:
- name: registry
port: 5000
targetPort: registry
--- HelmRelease: kube-system/spegel Service: kube-system/spegel-bootstrap
+++ HelmRelease: kube-system/spegel Service: kube-system/spegel-bootstrap
@@ -7,12 +7,13 @@
labels:
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
app.kubernetes.io/managed-by: Helm
spec:
selector:
+ app.kubernetes.io/component: spegel
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
clusterIP: None
publishNotReadyAddresses: true
ports:
- name: router
--- HelmRelease: kube-system/spegel DaemonSet: kube-system/spegel
+++ HelmRelease: kube-system/spegel DaemonSet: kube-system/spegel
@@ -2,36 +2,40 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: spegel
namespace: kube-system
labels:
+ app.kubernetes.io/component: spegel
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
app.kubernetes.io/managed-by: Helm
spec:
revisionHistoryLimit: 10
updateStrategy: {}
selector:
matchLabels:
+ app.kubernetes.io/component: spegel
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
template:
metadata:
labels:
+ app.kubernetes.io/component: spegel
app.kubernetes.io/name: spegel
app.kubernetes.io/instance: spegel
spec:
serviceAccountName: spegel
securityContext: {}
priorityClassName: system-node-critical
initContainers:
- name: configuration
- image: ghcr.io/spegel-org/spegel@sha256:7cec52c7c42cbff593087b6f3645bb58a7e1f1a5b861d767d062ce22533f9394
+ image: ghcr.io/spegel-org/spegel@sha256:82f5dd969ed74e3a9cfd6284045099a161778a0d85f9e01a234a62f15eb9d696
imagePullPolicy: IfNotPresent
- securityContext: {}
+ securityContext:
+ readOnlyRootFilesystem: true
args:
- configuration
- --log-level=INFO
- --containerd-registry-config-path=/etc/cri/conf.d/hosts
- --mirror-targets
- http://$(NODE_IP):29999
@@ -50,15 +54,16 @@
memory: 128Mi
volumeMounts:
- name: containerd-config
mountPath: /etc/cri/conf.d/hosts
containers:
- name: registry
- image: ghcr.io/spegel-org/spegel@sha256:7cec52c7c42cbff593087b6f3645bb58a7e1f1a5b861d767d062ce22533f9394
+ image: ghcr.io/spegel-org/spegel@sha256:82f5dd969ed74e3a9cfd6284045099a161778a0d85f9e01a234a62f15eb9d696
imagePullPolicy: IfNotPresent
- securityContext: {}
+ securityContext:
+ readOnlyRootFilesystem: true
args:
- registry
- --log-level=INFO
- --mirror-resolve-retries=3
- --mirror-resolve-timeout=20ms
- --registry-addr=:5000
@@ -66,17 +71,17 @@
- --metrics-addr=:9090
- --containerd-sock=/run/containerd/containerd.sock
- --containerd-namespace=k8s.io
- --containerd-registry-config-path=/etc/cri/conf.d/hosts
- --bootstrap-kind=dns
- --dns-bootstrap-domain=spegel-bootstrap.kube-system.svc.cluster.local.
- - --resolve-latest-tag=true
- - --local-addr=$(NODE_IP):29999
- --containerd-content-path=/var/lib/containerd/io.containerd.content.v1.content
- - --debug-web-enabled=false
+ - --debug-web-enabled=true
env:
+ - name: DATA_DIR
+ value: ''
- name: GOMEMLIMIT
valueFrom:
resourceFieldRef:
resource: limits.memory
divisor: 1
- name: NODE_IP
@@ -95,17 +100,17 @@
containerPort: 9090
protocol: TCP
startupProbe:
periodSeconds: 3
failureThreshold: 60
httpGet:
- path: /healthz
+ path: /readyz
port: registry
readinessProbe:
httpGet:
- path: /healthz
+ path: /readyz
port: registry
volumeMounts:
- name: containerd-sock
mountPath: /run/containerd/containerd.sock
- name: containerd-content
mountPath: /var/lib/containerd/io.containerd.content.v1.content
--- HelmRelease: kube-system/spegel Service: kube-system/spegel-cleanup
+++ HelmRelease: kube-system/spegel Service: kube-system/spegel-cleanup
@@ -0,0 +1,27 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: spegel-cleanup
+ namespace: kube-system
+ labels:
+ app.kubernetes.io/component: cleanup
+ app.kubernetes.io/name: spegel
+ app.kubernetes.io/instance: spegel
+ app.kubernetes.io/managed-by: Helm
+ annotations:
+ helm.sh/hook: post-delete
+ helm.sh/hook-delete-policy: before-hook-creation, hook-succeeded
+ helm.sh/hook-weight: '0'
+spec:
+ selector:
+ app.kubernetes.io/component: cleanup
+ app.kubernetes.io/name: spegel
+ app.kubernetes.io/instance: spegel
+ clusterIP: None
+ publishNotReadyAddresses: true
+ ports:
+ - name: readiness
+ port: 8080
+ protocol: TCP
+
--- HelmRelease: kube-system/spegel DaemonSet: kube-system/spegel-cleanup
+++ HelmRelease: kube-system/spegel DaemonSet: kube-system/spegel-cleanup
@@ -0,0 +1,62 @@
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: spegel-cleanup
+ namespace: kube-system
+ labels:
+ app.kubernetes.io/component: cleanup
+ app.kubernetes.io/name: spegel
+ app.kubernetes.io/instance: spegel
+ app.kubernetes.io/managed-by: Helm
+ annotations:
+ helm.sh/hook: post-delete
+ helm.sh/hook-delete-policy: before-hook-creation, hook-succeeded
+ helm.sh/hook-weight: '0'
+spec:
+ selector:
+ matchLabels:
+ app.kubernetes.io/component: cleanup
+ app.kubernetes.io/name: spegel
+ app.kubernetes.io/instance: spegel
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/component: cleanup
+ app.kubernetes.io/name: spegel
+ app.kubernetes.io/instance: spegel
+ spec:
+ securityContext: {}
+ priorityClassName: system-node-critical
+ containers:
+ - name: cleanup
+ image: ghcr.io/spegel-org/spegel@sha256:82f5dd969ed74e3a9cfd6284045099a161778a0d85f9e01a234a62f15eb9d696
+ imagePullPolicy: IfNotPresent
+ args:
+ - cleanup
+ - --containerd-registry-config-path=/etc/cri/conf.d/hosts
+ - --addr=:8080
+ readinessProbe:
+ httpGet:
+ path: /readyz
+ port: readiness
+ ports:
+ - name: readiness
+ containerPort: 8080
+ protocol: TCP
+ volumeMounts:
+ - name: containerd-config
+ mountPath: /etc/cri/conf.d/hosts
+ volumes:
+ - name: containerd-config
+ hostPath:
+ path: /etc/cri/conf.d/hosts
+ type: DirectoryOrCreate
+ tolerations:
+ - key: CriticalAddonsOnly
+ operator: Exists
+ - effect: NoExecute
+ operator: Exists
+ - effect: NoSchedule
+ operator: Exists
+
--- HelmRelease: kube-system/spegel Pod: kube-system/spegel-cleanup-wait
+++ HelmRelease: kube-system/spegel Pod: kube-system/spegel-cleanup-wait
@@ -0,0 +1,26 @@
+---
+apiVersion: v1
+kind: Pod
+metadata:
+ name: spegel-cleanup-wait
+ namespace: kube-system
+ labels:
+ app.kubernetes.io/component: cleanup-wait
+ app.kubernetes.io/name: spegel
+ app.kubernetes.io/instance: spegel
+ app.kubernetes.io/managed-by: Helm
+ annotations:
+ helm.sh/hook: post-delete
+ helm.sh/hook-delete-policy: before-hook-creation, hook-succeeded
+ helm.sh/hook-weight: '1'
+spec:
+ containers:
+ - name: cleanup-wait
+ image: ghcr.io/spegel-org/spegel@sha256:82f5dd969ed74e3a9cfd6284045099a161778a0d85f9e01a234a62f15eb9d696
+ imagePullPolicy: IfNotPresent
+ args:
+ - cleanup-wait
+ - --probe-endpoint=spegel-cleanup.kube-system.svc.cluster.local.:8080
+ restartPolicy: Never
+ terminationGracePeriodSeconds: 0
+ |
Contributor
Author
--- kubernetes/apps/kube-system/spegel/app Kustomization: kube-system/spegel HelmRelease: kube-system/spegel
+++ kubernetes/apps/kube-system/spegel/app Kustomization: kube-system/spegel HelmRelease: kube-system/spegel
@@ -13,13 +13,13 @@
spec:
chart: spegel
sourceRef:
kind: HelmRepository
name: spegel
namespace: flux-system
- version: 0.1.1
+ version: 0.6.0
install:
remediation:
retries: 3
interval: 30m
upgrade:
cleanupOnFail: true |
b5d0b93 to
0d7928a
Compare
3e9a192 to
ce781fe
Compare
ce781fe to
9044a0e
Compare
9044a0e to
39971ca
Compare
39971ca to
7300d73
Compare
7300d73 to
ae80a23
Compare
ae80a23 to
4937060
Compare
4937060 to
cecbffe
Compare
cecbffe to
c22c96c
Compare
c22c96c to
3efbf08
Compare
3efbf08 to
e0c964c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
0.1.1→0.6.0Warning
Some dependencies could not be looked up. Check the Dependency Dashboard for more information.
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR has been generated by Renovate Bot.