Bugfix for storage EBS version bump
This commit is contained in:
parent
79b6967ca8
commit
2d6fa46606
@ -1,6 +1,6 @@
|
||||
# kubezero-ci
|
||||
|
||||
 
|
||||
 
|
||||
|
||||
KubeZero umbrella chart for all things CI
|
||||
|
||||
@ -18,10 +18,10 @@ Kubernetes: `>= 1.24.0`
|
||||
|
||||
| Repository | Name | Version |
|
||||
|------------|------|---------|
|
||||
| https://aquasecurity.github.io/helm-charts/ | trivy | 0.6.0 |
|
||||
| https://aquasecurity.github.io/helm-charts/ | trivy | 0.7.0 |
|
||||
| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
|
||||
| https://charts.jenkins.io | jenkins | 4.3.2 |
|
||||
| https://dl.gitea.io/charts/ | gitea | 7.0.4 |
|
||||
| https://charts.jenkins.io | jenkins | 4.3.20 |
|
||||
| https://dl.gitea.io/charts/ | gitea | 8.0.3 |
|
||||
| https://gocd.github.io/helm-chart | gocd | 1.40.8 |
|
||||
|
||||
# Jenkins
|
||||
@ -96,18 +96,18 @@ Kubernetes: `>= 1.24.0`
|
||||
| jenkins.controller.initContainerResources.limits.memory | string | `"1024Mi"` | |
|
||||
| jenkins.controller.initContainerResources.requests.cpu | string | `"50m"` | |
|
||||
| jenkins.controller.initContainerResources.requests.memory | string | `"256Mi"` | |
|
||||
| jenkins.controller.installPlugins[0] | string | `"kubernetes:3883.v4d70a_a_a_df034"` | |
|
||||
| jenkins.controller.installPlugins[0] | string | `"kubernetes:3910.ve59cec5e33ea_"` | |
|
||||
| jenkins.controller.installPlugins[10] | string | `"build-discarder:139.v05696a_7fe240"` | |
|
||||
| jenkins.controller.installPlugins[11] | string | `"dark-theme:302.vf069cb_e01486"` | |
|
||||
| jenkins.controller.installPlugins[12] | string | `"kubernetes-credentials-provider:1.209.v862c6e5fb_1ef"` | |
|
||||
| jenkins.controller.installPlugins[11] | string | `"dark-theme:315.va_22e7d692ea_a"` | |
|
||||
| jenkins.controller.installPlugins[12] | string | `"kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c"` | |
|
||||
| jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:581.v0c46fa_697ffd"` | |
|
||||
| jenkins.controller.installPlugins[2] | string | `"git:5.0.0"` | |
|
||||
| jenkins.controller.installPlugins[3] | string | `"basic-branch-build-strategies:71.vc1421f89888e"` | |
|
||||
| jenkins.controller.installPlugins[4] | string | `"pipeline-graph-view:154.v52138b_cb_557e"` | |
|
||||
| jenkins.controller.installPlugins[5] | string | `"pipeline-stage-view:2.31"` | |
|
||||
| jenkins.controller.installPlugins[6] | string | `"configuration-as-code:1569.vb_72405b_80249"` | |
|
||||
| jenkins.controller.installPlugins[7] | string | `"antisamy-markup-formatter:155.v795fb_8702324"` | |
|
||||
| jenkins.controller.installPlugins[8] | string | `"prometheus:2.1.1"` | |
|
||||
| jenkins.controller.installPlugins[4] | string | `"pipeline-graph-view:183.v9e27732d970f"` | |
|
||||
| jenkins.controller.installPlugins[5] | string | `"pipeline-stage-view:2.32"` | |
|
||||
| jenkins.controller.installPlugins[6] | string | `"configuration-as-code:1625.v27444588cc3d"` | |
|
||||
| jenkins.controller.installPlugins[7] | string | `"antisamy-markup-formatter:159.v25b_c67cd35fb_"` | |
|
||||
| jenkins.controller.installPlugins[8] | string | `"prometheus:2.2.1"` | |
|
||||
| jenkins.controller.installPlugins[9] | string | `"htmlpublisher:1.31"` | |
|
||||
| jenkins.controller.javaOpts | string | `"-XX:+UseContainerSupport -XX:+UseStringDeduplication -Dhudson.model.DirectoryBrowserSupport.CSP=\"sandbox allow-popups; default-src 'none'; img-src 'self' cdn.zero-downtime.net; style-src 'unsafe-inline';\""` | |
|
||||
| jenkins.controller.jenkinsOpts | string | `"--sessionTimeout=180 --sessionEviction=3600"` | |
|
||||
@ -132,7 +132,7 @@ Kubernetes: `>= 1.24.0`
|
||||
| jenkins.serviceAccountAgent.create | bool | `true` | |
|
||||
| jenkins.serviceAccountAgent.name | string | `"jenkins-podman-aws"` | |
|
||||
| trivy.enabled | bool | `false` | |
|
||||
| trivy.image.tag | string | `"0.37.3"` | |
|
||||
| trivy.image.tag | string | `"0.39.1"` | |
|
||||
| trivy.persistence.enabled | bool | `true` | |
|
||||
| trivy.persistence.size | string | `"1Gi"` | |
|
||||
| trivy.rbac.create | bool | `false` | |
|
||||
|
||||
@ -24,7 +24,7 @@ dependencies:
|
||||
condition: lvm-localpv.enabled
|
||||
# we patch: repository: https://openebs.github.io/lvm-localpv
|
||||
- name: aws-ebs-csi-driver
|
||||
version: 2.17.2
|
||||
version: 2.18.0
|
||||
condition: aws-ebs-csi-driver.enabled
|
||||
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
|
||||
- name: aws-efs-csi-driver
|
||||
|
||||
@ -23,7 +23,7 @@ Kubernetes: `>= 1.24.0`
|
||||
| | lvm-localpv | 1.0.1 |
|
||||
| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
|
||||
| https://k8up-io.github.io/k8up | k8up | 4.2.0 |
|
||||
| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.17.2 |
|
||||
| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.18.0 |
|
||||
|
||||
## Values
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
"subdir": "contrib/mixin"
|
||||
}
|
||||
},
|
||||
"version": "5872b80ed5e1aca4f6bb1d9a00b60e24826b9631",
|
||||
"version": "217d183e5a2b2b7e826825f8218b8c4f53590a8f",
|
||||
"sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
|
||||
},
|
||||
{
|
||||
@ -38,7 +38,7 @@
|
||||
"subdir": "grafana-builder"
|
||||
}
|
||||
},
|
||||
"version": "713f3cae6766cbcbadce69074cb88c5538c8cb5c",
|
||||
"version": "af3ca2c3fae4096002b0c0c921f18ca7da8d361f",
|
||||
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,5 +1,13 @@
|
||||
{{- if .Values.snapshotController.enabled }}
|
||||
kind: StatefulSet
|
||||
# This YAML file shows how to deploy the snapshot controller
|
||||
|
||||
# The snapshot controller implements the control loop for CSI snapshot functionality.
|
||||
# It should be installed as part of the base Kubernetes distribution in an appropriate
|
||||
# namespace for components implementing base system functionality. For installing with
|
||||
# Vanilla Kubernetes, kube-system makes sense for the namespace.
|
||||
|
||||
---
|
||||
kind: Deployment
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: snapshot-controller
|
||||
@ -7,11 +15,19 @@ metadata:
|
||||
labels:
|
||||
{{- include "kubezero-lib.labels" . | nindent 4 }}
|
||||
spec:
|
||||
serviceName: "snapshot-controller"
|
||||
replicas: {{ .Values.snapshotController.replicas }}
|
||||
selector:
|
||||
matchLabels:
|
||||
app: snapshot-controller
|
||||
# the snapshot controller won't be marked as ready if the v1 CRDs are unavailable
|
||||
# in #504 the snapshot-controller will exit after around 7.5 seconds if it
|
||||
# can't find the v1 CRDs so this value should be greater than that
|
||||
minReadySeconds: 15
|
||||
strategy:
|
||||
rollingUpdate:
|
||||
maxSurge: 0
|
||||
maxUnavailable: 1
|
||||
type: RollingUpdate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
@ -27,15 +43,18 @@ spec:
|
||||
values:
|
||||
- snapshot-controller
|
||||
topologyKey: "kubernetes.io/hostname"
|
||||
serviceAccount: snapshot-controller
|
||||
serviceAccountName: snapshot-controller
|
||||
containers:
|
||||
- name: snapshot-controller
|
||||
image: k8s.gcr.io/sig-storage/snapshot-controller:v4.0.0
|
||||
image: registry.k8s.io/sig-storage/snapshot-controller:v6.2.1
|
||||
args:
|
||||
- "--v={{ .Values.snapshotController.logLevel }}"
|
||||
{{- if gt (int .Values.snapshotController.replicas) 1 }}
|
||||
- "--leader-election=true"
|
||||
{{- end }}
|
||||
# Add a marker to the snapshot-controller manifests. This is needed to enable feature gates in CSI prow jobs.
|
||||
# For example, in https://github.com/kubernetes-csi/csi-release-tools/pull/209, the snapshot-controller YAML is updated to add --prevent-volume-mode-conversion=true so that the feature can be enabled for certain e2e tests.
|
||||
# end snapshot controller args
|
||||
imagePullPolicy: IfNotPresent
|
||||
resources:
|
||||
{{- toYaml .Values.snapshotController.resources | nindent 12 }}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
#!/bin/bash
|
||||
set -ex
|
||||
|
||||
#helm dependencies update
|
||||
|
||||
### Gemini
|
||||
rm -rf charts/gemini
|
||||
helm pull fairwinds-stable/gemini --untar --untardir charts
|
||||
@ -37,4 +35,6 @@ patch -i efs.patch -p0 --no-backup-if-mismatch
|
||||
cd jsonnet
|
||||
make render
|
||||
|
||||
helm dependencies update
|
||||
|
||||
helm-docs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user