Skip to content

Commit 3061e7d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #690 from aramase/automated-cherry-pick-of-#689-upstream-release-0.2
Automated cherry pick of #689: release: update manifest and helm charts for v0.2.0
2 parents 2a6455b + f17137f commit 3061e7d

27 files changed

+197
-75
lines changed

‎charts/index.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
apiVersion: v1
22
entries:
33
secrets-store-csi-driver:
4+
- apiVersion: v2
5+
appVersion: 0.2.0
6+
created: "2021-08-12T13:36:37.324621-07:00"
7+
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
8+
cluster.
9+
digest: 63d3111b172313165bb2e7406b8c3f3a4d9341a97e3dcf213b4b6c28b0b59443
10+
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
11+
kubeVersion: '>=1.16.0-0'
12+
maintainers:
13+
- email: ritazh@microsoft.com
14+
name: Rita Zhang
15+
name: secrets-store-csi-driver
16+
sources:
17+
- https://github.com/kubernetes-sigs/secrets-store-csi-driver
18+
urls:
19+
- https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.2.0.tgz
20+
version: 0.2.0
421
- apiVersion: v2
522
appVersion: 0.1.0
623
created: "2021-07-26T09:41:27.883002-07:00"
@@ -273,4 +290,4 @@ entries:
273290
urls:
274291
- https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.0.9.tgz
275292
version: 0.0.9
276-
generated: "2021-07-26T09:41:27.881293-07:00"
293+
generated: "2021-08-12T13:36:37.321857-07:00"

‎charts/secrets-store-csi-driver-0.2.0.tgz

8.56 KB
Binary file not shown.

‎charts/secrets-store-csi-driver/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: secrets-store-csi-driver
3-
version: 0.1.0
4-
appVersion: 0.1.0
3+
version: 0.2.0
4+
appVersion: 0.2.0
55
kubeVersion: ">=1.16.0-0"
66
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

‎charts/secrets-store-csi-driver/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
3030
| `fullnameOverride` | String to fully override secrets-store-csi-driver.fullname template with a string | `""` |
3131
| `linux.image.repository` | Linux image repository | `k8s.gcr.io/csi-secrets-store/driver` |
3232
| `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` |
33-
| `linux.image.tag` | Linux image tag | `v0.1.0` |
33+
| `linux.image.tag` | Linux image tag | `v0.2.0` |
3434
| `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
3535
| `linux.driver.resources` | The resource request/limits for the linux secrets-store container image | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
3636
| `linux.enabled` | Install secrets store csi driver on linux nodes | true |
@@ -58,7 +58,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
5858
| `linux.updateStrategy` | Configure a custom update strategy for the daemonset on linux nodes | `RollingUpdate with 1 maxUnavailable` |
5959
| `windows.image.repository` | Windows image repository | `k8s.gcr.io/csi-secrets-store/driver` |
6060
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
61-
| `windows.image.tag` | Windows image tag | `v0.1.0` |
61+
| `windows.image.tag` | Windows image tag | `v0.2.0` |
6262
| `windows.affinity` | Windows affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
6363
| `windows.driver.resources` | The resource request/limits for the windows secrets-store container image | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |
6464
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |

‎charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,18 @@ spec:
1919
- name: v1alpha1
2020
schema:
2121
openAPIV3Schema:
22-
description: SecretProviderClass is the Schema for the secretproviderclasses API
22+
description: SecretProviderClass is the Schema for the secretproviderclasses
23+
API
2324
properties:
2425
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26+
description: 'APIVersion defines the versioned schema of this representation
27+
of an object. Servers should convert recognized schemas to the latest
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2629
type: string
2730
kind:
28-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: 'Kind is a string value representing the REST resource this
32+
object represents. Servers may infer this from the endpoint the client
33+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
2934
type: string
3035
metadata:
3136
type: object
@@ -42,7 +47,8 @@ spec:
4247
type: string
4348
secretObjects:
4449
items:
45-
description: SecretObject defines the desired state of synced K8s secret objects
50+
description: SecretObject defines the desired state of synced K8s
51+
secret objects
4652
properties:
4753
annotations:
4854
additionalProperties:
@@ -51,7 +57,8 @@ spec:
5157
type: object
5258
data:
5359
items:
54-
description: SecretObjectData defines the desired state of synced K8s secret object data
60+
description: SecretObjectData defines the desired state of
61+
synced K8s secret object data
5562
properties:
5663
key:
5764
description: data field to populate
@@ -80,7 +87,8 @@ spec:
8087
properties:
8188
byPod:
8289
items:
83-
description: ByPodStatus defines the state of SecretProviderClass as seen by an individual controller
90+
description: ByPodStatus defines the state of SecretProviderClass
91+
as seen by an individual controller
8492
properties:
8593
id:
8694
description: id of the pod that wrote the status

‎charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,31 @@ spec:
1919
- name: v1alpha1
2020
schema:
2121
openAPIV3Schema:
22-
description: SecretProviderClassPodStatus is the Schema for the secretproviderclassespodstatus API
22+
description: SecretProviderClassPodStatus is the Schema for the secretproviderclassespodstatus
23+
API
2324
properties:
2425
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26+
description: 'APIVersion defines the versioned schema of this representation
27+
of an object. Servers should convert recognized schemas to the latest
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2629
type: string
2730
kind:
28-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: 'Kind is a string value representing the REST resource this
32+
object represents. Servers may infer this from the endpoint the client
33+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
2934
type: string
3035
metadata:
3136
type: object
3237
status:
33-
description: SecretProviderClassPodStatusStatus defines the observed state of SecretProviderClassPodStatus
38+
description: SecretProviderClassPodStatusStatus defines the observed state
39+
of SecretProviderClassPodStatus
3440
properties:
3541
mounted:
3642
type: boolean
3743
objects:
3844
items:
39-
description: SecretProviderClassObject defines the object fetched from external secrets store
45+
description: SecretProviderClassObject defines the object fetched
46+
from external secrets store
4047
properties:
4148
id:
4249
type: string

‎charts/secrets-store-csi-driver/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
1212
If release name contains chart name it will be used as a full name.
1313
*/}}
1414
{{- define "sscd.fullname" -}}
15+
{{- if .Values.fullnameOverride -}}
16+
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
17+
{{- else -}}
1518
{{- $name := default .Chart.Name .Values.nameOverride -}}
1619
{{- if contains $name .Release.Name -}}
1720
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
1821
{{- else -}}
1922
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
2023
{{- end -}}
2124
{{- end -}}
25+
{{- end -}}
2226

2327
{{/*
2428
Standard labels for helm resources

‎charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ metadata:
4848
namespace: {{ .Release.Namespace }}
4949
{{ include "sscd.labels" . | indent 2 }}
5050
annotations:
51-
helm.sh/hook: pre-upgrade
51+
helm.sh/hook: pre-install,pre-upgrade
5252
helm.sh/hook-weight: "1"
5353
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
5454
spec:
@@ -69,3 +69,10 @@ spec:
6969
imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
7070
nodeSelector:
7171
kubernetes.io/os: linux
72+
{{- if .Values.linux.nodeSelector }}
73+
{{- toYaml .Values.linux.nodeSelector | nindent 8 }}
74+
{{- end }}
75+
{{- with .Values.linux.tolerations }}
76+
tolerations:
77+
{{ toYaml . | indent 8 }}
78+
{{- end }}

‎charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,10 @@ spec:
7272
imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
7373
nodeSelector:
7474
kubernetes.io/os: linux
75+
{{- if .Values.linux.nodeSelector }}
76+
{{- toYaml .Values.linux.nodeSelector | nindent 8 }}
77+
{{- end }}
78+
{{- with .Values.linux.tolerations }}
79+
tolerations:
80+
{{ toYaml . | indent 8 }}
81+
{{- end }}

‎charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ spec:
108108
- containerPort: {{ .Values.livenessProbe.port }}
109109
name: healthz
110110
protocol: TCP
111+
- containerPort: {{ trimPrefix ":" .Values.windows.metricsAddr }}
112+
name: metrics
113+
protocol: TCP
111114
livenessProbe:
112115
failureThreshold: 5
113116
httpGet:

‎charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ spec:
110110
- containerPort: {{ .Values.livenessProbe.port }}
111111
name: healthz
112112
protocol: TCP
113+
- containerPort: {{ trimPrefix ":" .Values.linux.metricsAddr }}
114+
name: metrics
115+
protocol: TCP
113116
livenessProbe:
114117
failureThreshold: 5
115118
httpGet:

‎charts/secrets-store-csi-driver/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ linux:
22
enabled: true
33
image:
44
repository: k8s.gcr.io/csi-secrets-store/driver
5-
tag: v0.1.0
5+
tag: v0.2.0
66
pullPolicy: IfNotPresent
77

88
crds:
99
image:
1010
repository: k8s.gcr.io/csi-secrets-store/driver-crds
11-
tag: v0.1.0
11+
tag: v0.2.0
1212
pullPolicy: IfNotPresent
1313

1414
## Prevent the CSI driver from being scheduled on virtual-kublet nodes
@@ -92,7 +92,7 @@ windows:
9292
enabled: false
9393
image:
9494
repository: k8s.gcr.io/csi-secrets-store/driver
95-
tag: v0.1.0
95+
tag: v0.2.0
9696
pullPolicy: IfNotPresent
9797

9898
## Prevent the CSI driver from being scheduled on virtual-kublet nodes

‎config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,18 @@ spec:
1919
- name: v1alpha1
2020
schema:
2121
openAPIV3Schema:
22-
description: SecretProviderClass is the Schema for the secretproviderclasses API
22+
description: SecretProviderClass is the Schema for the secretproviderclasses
23+
API
2324
properties:
2425
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26+
description: 'APIVersion defines the versioned schema of this representation
27+
of an object. Servers should convert recognized schemas to the latest
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2629
type: string
2730
kind:
28-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: 'Kind is a string value representing the REST resource this
32+
object represents. Servers may infer this from the endpoint the client
33+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
2934
type: string
3035
metadata:
3136
type: object
@@ -42,7 +47,8 @@ spec:
4247
type: string
4348
secretObjects:
4449
items:
45-
description: SecretObject defines the desired state of synced K8s secret objects
50+
description: SecretObject defines the desired state of synced K8s
51+
secret objects
4652
properties:
4753
annotations:
4854
additionalProperties:
@@ -51,7 +57,8 @@ spec:
5157
type: object
5258
data:
5359
items:
54-
description: SecretObjectData defines the desired state of synced K8s secret object data
60+
description: SecretObjectData defines the desired state of
61+
synced K8s secret object data
5562
properties:
5663
key:
5764
description: data field to populate
@@ -80,7 +87,8 @@ spec:
8087
properties:
8188
byPod:
8289
items:
83-
description: ByPodStatus defines the state of SecretProviderClass as seen by an individual controller
90+
description: ByPodStatus defines the state of SecretProviderClass
91+
as seen by an individual controller
8492
properties:
8593
id:
8694
description: id of the pod that wrote the status

‎config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,31 @@ spec:
1919
- name: v1alpha1
2020
schema:
2121
openAPIV3Schema:
22-
description: SecretProviderClassPodStatus is the Schema for the secretproviderclassespodstatus API
22+
description: SecretProviderClassPodStatus is the Schema for the secretproviderclassespodstatus
23+
API
2324
properties:
2425
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26+
description: 'APIVersion defines the versioned schema of this representation
27+
of an object. Servers should convert recognized schemas to the latest
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2629
type: string
2730
kind:
28-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: 'Kind is a string value representing the REST resource this
32+
object represents. Servers may infer this from the endpoint the client
33+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
2934
type: string
3035
metadata:
3136
type: object
3237
status:
33-
description: SecretProviderClassPodStatusStatus defines the observed state of SecretProviderClassPodStatus
38+
description: SecretProviderClassPodStatusStatus defines the observed state
39+
of SecretProviderClassPodStatus
3440
properties:
3541
mounted:
3642
type: boolean
3743
objects:
3844
items:
39-
description: SecretProviderClassObject defines the object fetched from external secrets store
45+
description: SecretProviderClassObject defines the object fetched
46+
from external secrets store
4047
properties:
4148
id:
4249
type: string

‎deploy/secrets-store-csi-driver-windows.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
cpu: 10m
4343
memory: 20Mi
4444
- name: secrets-store
45-
image: k8s.gcr.io/csi-secrets-store/driver:v0.1.0
45+
image: k8s.gcr.io/csi-secrets-store/driver:v0.2.0
4646
args:
4747
- "--endpoint=$(CSI_ENDPOINT)"
4848
- "--nodeid=$(KUBE_NODE_NAME)"
@@ -66,6 +66,9 @@ spec:
6666
- containerPort: 9808
6767
name: healthz
6868
protocol: TCP
69+
- containerPort: 8095
70+
name: metrics
71+
protocol: TCP
6972
livenessProbe:
7073
failureThreshold: 5
7174
httpGet:

0 commit comments

Comments
 (0)