Skip to content

Commit

Permalink
Automated cherry pick of #1112: release: update manifest and helm cha…
Browse files Browse the repository at this point in the history 
…rts for v1.4.1 (#1113)

* release: update manifest and helm charts for v1.4.1

Signed-off-by: Anish Ramasekar <[email protected]>

* chore: pin buildx to `v0.10.6`

Signed-off-by: Anish Ramasekar <[email protected]>

* ci: pin k8s-extension version to `1.3.5`

Signed-off-by: Anish Ramasekar <[email protected]>

---------

Signed-off-by: Anish Ramasekar <[email protected]>
  • Loading branch information
@aramase
aramase authored Apr 5, 2023
1 parent 5577be0 commit 16fd737
Show file tree
Hide file tree
Showing 17 changed files with 54 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .pipelines/templates/arc/setup.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
steps:
- script: |
az extension add --name connectedk8s
az extension add --name k8s-extension
az extension add --name k8s-extension --version 1.3.5
echo "az version:"
az version
displayName: "add cli extensions"
Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ REPO_PATH="$(ORG_PATH)/$(PROJECT_NAME)"
REGISTRY_NAME ?= upstream
REPO_PREFIX ?= k8s/csi/secrets-store
REGISTRY ?= $(REGISTRY_NAME).azurecr.io/$(REPO_PREFIX)
IMAGE_VERSION ?= v1.4.0
IMAGE_VERSION ?= v1.4.1
IMAGE_NAME ?= provider-azure
CONFORMANCE_IMAGE_NAME ?= provider-azure-arc-conformance
IMAGE_TAG := $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
Expand Down Expand Up @@ -49,6 +49,9 @@ OSVERSION ?= 1809
# Output type of docker buildx build
OUTPUT_TYPE ?= registry
BUILDX_BUILDER_NAME ?= img-builder
# pinning buildkit version to v0.10.6 as v0.11.0 is injecting sbom/prov to manifest
# causing the manifest push to fail
BUILDKIT_VERSION ?= 0.10.6

# step cli version
STEP_CLI_VERSION=0.18.0
Expand Down Expand Up @@ -145,7 +148,7 @@ container-windows: docker-buildx-builder
.PHONY: docker-buildx-builder
docker-buildx-builder:
@if ! docker buildx ls | grep $(BUILDX_BUILDER_NAME); then \
docker buildx create --name $(BUILDX_BUILDER_NAME) --use; \
docker buildx create --driver-opt image=mcr.microsoft.com/oss/moby/buildkit:$(BUILDKIT_VERSION) --name $(BUILDX_BUILDER_NAME) --use; \
docker buildx inspect $(BUILDX_BUILDER_NAME) --bootstrap; \
fi

Expand Down
4 changes: 2 additions & 2 deletions charts/csi-secrets-store-provider-azure/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: csi-secrets-store-provider-azure
version: 1.4.0
appVersion: 1.4.0
version: 1.4.2
appVersion: 1.4.1
kubeVersion: ">=1.16.0-0"
description: A Helm chart to install the Secrets Store CSI Driver and the Azure Keyvault Provider inside a Kubernetes cluster.
sources:
Expand Down
6 changes: 4 additions & 2 deletions charts/csi-secrets-store-provider-azure/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Azure Key Vault provider for Secrets Store CSI driver allows you to get secret c
| `1.2.2` | `1.2.2` | `1.2.0` |
| `1.3.0` | `1.2.3` | `1.3.0` |
| `1.4.0` | `1.3.0` | `1.4.0` |
| `1.4.1` | `1.3.2` | `1.4.0` |
| `1.4.2` | `1.3.2` | `1.4.1` |

## Installation

Expand Down Expand Up @@ -66,7 +68,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `linux.enabled` | Install azure keyvault provider on linux nodes | true |
| `linux.image.repository` | Linux image repository | `mcr.microsoft.com/oss/azure/secrets-store/provider-azure` |
| `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` |
| `linux.image.tag` | Azure Keyvault Provider Linux image tag | `v1.4.0` |
| `linux.image.tag` | Azure Keyvault Provider Linux image tag | `v1.4.1` |
| `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
| `linux.tolerations` | Tolerations for the daemonset on linux nodes | `[{"operator": "Exists"}]` |
| `linux.resources` | Resource limit for provider pods on linux nodes | `requests.cpu: 50m`<br>`requests.memory: 100Mi`<br>`limits.cpu: 50m`<br>`limits.memory: 100Mi` |
Expand All @@ -87,7 +89,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `windows.enabled` | Install azure keyvault provider on windows nodes | false |
| `windows.image.repository` | Windows image repository | `mcr.microsoft.com/oss/azure/secrets-store/provider-azure` |
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
| `windows.image.tag` | Azure Keyvault Provider Windows image tag | `v1.4.0` |
| `windows.image.tag` | Azure Keyvault Provider Windows image tag | `v1.4.1` |
| `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
| `windows.tolerations` | Tolerations for the daemonset on windows nodes | `{}` |
| `windows.resources` | Resource limit for provider pods on windows nodes | `requests.cpu: 100m`<br>`requests.memory: 200Mi`<br>`limits.cpu: 100m`<br>`limits.memory: 200Mi` |
Expand Down
8 changes: 4 additions & 4 deletions charts/csi-secrets-store-provider-azure/arc-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ logVerbosity: 0
linux:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
tolerations: []
Expand Down Expand Up @@ -58,11 +58,11 @@ linux:
windows:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
tolerations: []
enabled: false
enabled: true
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -132,7 +132,7 @@ secrets-store-csi-driver:
prometheus.io/port: "8080"

windows:
enabled: false
enabled: true
kubeletRootDir: C:\var\lib\kubelet
metricsAddr: ":8080"
image:
Expand Down
17 changes: 16 additions & 1 deletion charts/csi-secrets-store-provider-azure/templates/provider-azure-installer-windows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ spec:
{{- if .Values.windows.podLabels }}
{{- toYaml .Values.windows.podLabels | nindent 8 }}
{{- end }}
{{- if .Values.windows.podAnnotations }}
{{- if or .Values.windows.podAnnotations .Values.enableArcExtension }}
annotations:
{{- if .Values.windows.podAnnotations}}
{{- toYaml .Values.windows.podAnnotations | nindent 8 }}
{{- end }}
{{- if .Values.enableArcExtension }}
{{- if .Values.arc.enableMonitoring }}
prometheus.io/scrape: "true"
prometheus.io/port: "8898"
{{- end }}
{{- end }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
Expand Down Expand Up @@ -61,6 +69,13 @@ spec:
periodSeconds: 30
resources:
{{ toYaml .Values.windows.resources | indent 12 }}
{{- if .Values.enableArcExtension }}
{{- if .Values.Azure.proxySettings.isProxyEnabled }}
envFrom:
- secretRef:
name: arc-proxy-config
{{- end }}
{{- end }}
volumeMounts:
- name: provider-vol
mountPath: "C:\\provider"
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-secrets-store-provider-azure/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ enableArcExtension: false
linux:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
Expand Down Expand Up @@ -63,7 +63,7 @@ linux:
windows:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
Expand Down
2 changes: 1 addition & 1 deletion deployment/provider-azure-installer-windows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: csi-secrets-store-provider-azure
containers:
- name: provider-azure-installer
image: mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.0
image: mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.1
imagePullPolicy: IfNotPresent
args:
- --endpoint=unix://C:\\provider\\azure.sock
Expand Down
2 changes: 1 addition & 1 deletion deployment/provider-azure-installer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
hostNetwork: true
containers:
- name: provider-azure-installer
image: mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.0
image: mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.1
imagePullPolicy: IfNotPresent
args:
- --endpoint=unix:///provider/azure.sock
Expand Down
4 changes: 2 additions & 2 deletions manifest_staging/charts/csi-secrets-store-provider-azure/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: csi-secrets-store-provider-azure
version: 1.4.0
appVersion: 1.4.0
version: 1.4.2
appVersion: 1.4.1
kubeVersion: ">=1.16.0-0"
description: A Helm chart to install the Secrets Store CSI Driver and the Azure Keyvault Provider inside a Kubernetes cluster.
sources:
Expand Down
6 changes: 4 additions & 2 deletions manifest_staging/charts/csi-secrets-store-provider-azure/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Azure Key Vault provider for Secrets Store CSI driver allows you to get secret c
| `1.2.2` | `1.2.2` | `1.2.0` |
| `1.3.0` | `1.2.3` | `1.3.0` |
| `1.4.0` | `1.3.0` | `1.4.0` |
| `1.4.1` | `1.3.2` | `1.4.0` |
| `1.4.2` | `1.3.2` | `1.4.1` |

## Installation

Expand Down Expand Up @@ -66,7 +68,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `linux.enabled` | Install azure keyvault provider on linux nodes | true |
| `linux.image.repository` | Linux image repository | `mcr.microsoft.com/oss/azure/secrets-store/provider-azure` |
| `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` |
| `linux.image.tag` | Azure Keyvault Provider Linux image tag | `v1.4.0` |
| `linux.image.tag` | Azure Keyvault Provider Linux image tag | `v1.4.1` |
| `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
| `linux.tolerations` | Tolerations for the daemonset on linux nodes | `[{"operator": "Exists"}]` |
| `linux.resources` | Resource limit for provider pods on linux nodes | `requests.cpu: 50m`<br>`requests.memory: 100Mi`<br>`limits.cpu: 50m`<br>`limits.memory: 100Mi` |
Expand All @@ -87,7 +89,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `windows.enabled` | Install azure keyvault provider on windows nodes | false |
| `windows.image.repository` | Windows image repository | `mcr.microsoft.com/oss/azure/secrets-store/provider-azure` |
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
| `windows.image.tag` | Azure Keyvault Provider Windows image tag | `v1.4.0` |
| `windows.image.tag` | Azure Keyvault Provider Windows image tag | `v1.4.1` |
| `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
| `windows.tolerations` | Tolerations for the daemonset on windows nodes | `{}` |
| `windows.resources` | Resource limit for provider pods on windows nodes | `requests.cpu: 100m`<br>`requests.memory: 200Mi`<br>`limits.cpu: 100m`<br>`limits.memory: 200Mi` |
Expand Down
4 changes: 2 additions & 2 deletions manifest_staging/charts/csi-secrets-store-provider-azure/arc-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ logVerbosity: 0
linux:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
tolerations: []
Expand Down Expand Up @@ -58,7 +58,7 @@ linux:
windows:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
tolerations: []
Expand Down
4 changes: 2 additions & 2 deletions manifest_staging/charts/csi-secrets-store-provider-azure/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ enableArcExtension: false
linux:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
Expand Down Expand Up @@ -63,7 +63,7 @@ linux:
windows:
image:
repository: mcr.microsoft.com/oss/azure/secrets-store/provider-azure
tag: v1.4.0
tag: v1.4.1
pullPolicy: IfNotPresent
nodeSelector: {}
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/deployment/provider-azure-installer-windows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: csi-secrets-store-provider-azure
containers:
- name: provider-azure-installer
image: mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.0
image: mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.1
imagePullPolicy: IfNotPresent
args:
- --endpoint=unix://C:\\provider\\azure.sock
Expand Down
Loading

0 comments on commit 16fd737

Please sign in to comment.