Skip to content

Commit

Permalink
Merge pull request #43 from RomanBednar/rebase-v1.28.0
Browse files Browse the repository at this point in the history
STOR-1164: Rebase to v1.28.0 for OCP 4.14
  • Loading branch information
openshift-merge-robot committed Jun 19, 2023
2 parents e8ebff5 + 8559324 commit 7d033aa
Show file tree
Hide file tree
Showing 2,776 changed files with 410,352 additions and 352,683 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.20-openshift-4.14
tag: rhel-8-release-golang-1.20-openshift-4.14
31 changes: 31 additions & 0 deletions .github/dependabot.yaml
@@ -0,0 +1,31 @@
version: 2
updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
open-pull-requests-limit: 1
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
open-pull-requests-limit: 1
- package-ecosystem: "docker"
directory: "/pkg/azurediskplugin/"
schedule:
interval: "daily"
time: "01:00"
timezone: "Asia/Shanghai"
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
- "kind/cleanup"
2 changes: 1 addition & 1 deletion Dockerfile.openshift.rhel7
Expand Up @@ -9,4 +9,4 @@ RUN yum install -y util-linux e2fsprogs xfsprogs ca-certificates && yum clean al

LABEL description="Azure Disk CSI Driver"

ENTRYPOINT ["/bin/azurediskplugin"]
ENTRYPOINT ["/bin/azurediskplugin"]
43 changes: 37 additions & 6 deletions Makefile
Expand Up @@ -19,7 +19,7 @@ REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
IMAGE_NAME ?= azuredisk-csi
ifneq ($(BUILD_V2), true)
PLUGIN_NAME = azurediskplugin
IMAGE_VERSION ?= v1.26.0
IMAGE_VERSION ?= v1.28.0
CHART_VERSION ?= latest
else
PLUGIN_NAME = azurediskpluginv2
Expand All @@ -40,17 +40,23 @@ REV = $(shell git describe --long --tags --dirty)
BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
ENABLE_TOPOLOGY ?= false
LDFLAGS ?= "-X ${PKG}/pkg/azuredisk.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/azuredisk.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/azuredisk.buildDate=${BUILD_DATE} -extldflags "-static"" ${GOTAGS}
E2E_HELM_OPTIONS ?= --set image.azuredisk.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.azuredisk.tag=$(IMAGE_VERSION) --set image.azuredisk.pullPolicy=Always --set driver.userAgentSuffix="e2e-test"
E2E_HELM_OPTIONS ?= --set image.azuredisk.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.azuredisk.tag=$(IMAGE_VERSION) --set image.azuredisk.pullPolicy=Always --set driver.userAgentSuffix="e2e-test" --set snapshot.VolumeSnapshotClass.enabled=true --set snapshot.enabled=true --set node.getNodeIDFromIMDS=true
E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS}
ifdef DISABLE_ZONE
E2E_HELM_OPTIONS += --set node.supportZone=false
endif
ifdef KUBERNETES_VERSION # disable KubeletRegistrationProbe on capz cluster testing
E2E_HELM_OPTIONS += --set linux.enableRegistrationProbe=false --set windows.enableRegistrationProbe=false
endif
GINKGO_FLAGS = -ginkgo.v -ginkgo.timeout=24h
ifeq ($(ENABLE_TOPOLOGY), true)
GINKGO_FLAGS += -ginkgo.focus="\[multi-az\]"
else
GINKGO_FLAGS += -ginkgo.focus="\[single-az\]"
endif
ifdef NODE_MACHINE_TYPE # capz cluster
E2E_HELM_OPTIONS += --set controller.enableTrafficManager=true
endif
GOPATH ?= $(shell go env GOPATH)
GOBIN ?= $(GOPATH)/bin
GO111MODULE = on
Expand All @@ -62,7 +68,7 @@ ALL_OS = linux windows
ALL_ARCH.linux = amd64 arm64
ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
ALL_ARCH.windows = amd64
ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022
ALL_OSVERSIONS.windows := 1809 ltsc2022
ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-${osversion}-${arch}))
ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})

Expand All @@ -72,7 +78,7 @@ WINDOWS_USE_HOST_PROCESS_CONTAINERS ?= false
# The current context of image building
# The architecture of the image
ARCH ?= amd64
# OS Version for the Windows images: 1809, 1903, 1909, 2004, ltsc2022
# OS Version for the Windows images: 1809, ltsc2022
OSVERSION ?= 1809
# Output type of docker buildx build
OUTPUT_TYPE ?= registry
Expand Down Expand Up @@ -115,7 +121,11 @@ integration-test-v2: azuredisk-v2

.PHONY: e2e-bootstrap
e2e-bootstrap: install-helm
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
(docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest
else
docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest
endif
ifdef TEST_WINDOWS
helm install azuredisk-csi-driver charts/${CHART_VERSION}/azuredisk-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
${E2E_HELM_OPTIONS} \
Expand Down Expand Up @@ -175,7 +185,9 @@ container-linux:
--file ./pkg/azurediskplugin/Dockerfile \
--platform="linux/$(ARCH)" \
--build-arg ARCH=${ARCH} \
--build-arg PLUGIN_NAME=${PLUGIN_NAME}
--build-arg PLUGIN_NAME=${PLUGIN_NAME} \
--provenance=false \
--sbom=false

.PHONY: container-windows
container-windows:
Expand All @@ -187,7 +199,26 @@ container-windows:
--file ./pkg/azurediskplugin/Windows.Dockerfile \
--build-arg ARCH=${ARCH} \
--build-arg PLUGIN_NAME=${PLUGIN_NAME} \
--build-arg OSVERSION=$(OSVERSION)
--build-arg OSVERSION=$(OSVERSION) \
--provenance=false \
--sbom=false
# workaround: only build hostprocess image once
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
ifeq ($(OSVERSION),ltsc2022)
$(MAKE) container-windows-hostprocess
endif
endif

# Set --provenance=false to not generate the provenance (which is what causes the multi-platform index to be generated, even for a single platform).
.PHONY: container-windows-hostprocess
container-windows-hostprocess:
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" --provenance=false --sbom=false \
-t $(CSI_IMAGE_TAG)-windows-hp -f ./pkg/azurediskplugin/WindowsHostProcess.Dockerfile .

.PHONY: container-windows-hostprocess-latest
container-windows-hostprocess-latest:
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" --provenance=false --sbom=false \
-t $(CSI_IMAGE_TAG_LATEST)-windows-hp -f ./pkg/azurediskplugin/WindowsHostProcess.Dockerfile .

.PHONY: container-all
container-all: azuredisk-windows
Expand Down
1 change: 0 additions & 1 deletion OWNERS
@@ -1,4 +1,3 @@

approvers:
- openshift-storage-maintainers
component: "Storage"
Expand Down
3 changes: 2 additions & 1 deletion OWNERS_ALIASES
Expand Up @@ -5,4 +5,5 @@ aliases:
- gnufied
- bertinatto
- dobsonj

- RomanBednar
- mpatlasov
18 changes: 11 additions & 7 deletions README.md
@@ -1,11 +1,12 @@
# Azure Disk CSI driver for Kubernetes

[![Travis](https://travis-ci.org/kubernetes-sigs/azuredisk-csi-driver.svg)](https://travis-ci.org/kubernetes-sigs/azuredisk-csi-driver)
![linux build status](https://github.com/kubernetes-sigs/azuredisk-csi-driver/actions/workflows/linux.yml/badge.svg)
![windows build status](https://github.com/kubernetes-sigs/azuredisk-csi-driver/actions/workflows/windows.yml/badge.svg)
[![Coverage Status](https://coveralls.io/repos/github/kubernetes-sigs/azuredisk-csi-driver/badge.svg?branch=master)](https://coveralls.io/github/kubernetes-sigs/azuredisk-csi-driver?branch=master)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fkubernetes-sigs%2Fazuredisk-csi-driver.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fkubernetes-sigs%2Fazuredisk-csi-driver?ref=badge_shield)

### About
This driver allows Kubernetes to access [Azure Disk](https://azure.microsoft.com/en-us/services/storage/disks/) volume, csi plugin name: `disk.csi.azure.com`
This driver allows Kubernetes to access [Azure Disk](https://azure.microsoft.com/en-us/services/storage/disks/) volume, csi plugin name: `disk.csi.azure.com`, supported accessModes: `ReadWriteOnce`

Disclaimer: Deploying this driver manually is not an officially supported Microsoft product. For a fully managed and supported experience on Kubernetes, use [AKS with the managed Azure disk csi driver](https://learn.microsoft.com/en-us/azure/aks/azure-disk-csi).

Expand All @@ -22,9 +23,9 @@ V2: Preview
|Driver Version |Image | supported k8s version |
|----------------|-----------------------------------------------------------|-----------------------|
|`master` branch |mcr.microsoft.com/k8s/csi/azuredisk-csi:latest | 1.21+ |
|v1.26.1 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.26.1 | 1.21+ |
|v1.25.0 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.25.0 | 1.21+ |
|v1.24.0 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.24.0 | 1.21+ |
|v1.28.0 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.0 | 1.21+ |
|v1.27.1 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.27.1 | 1.21+ |
|v1.26.4 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.26.4 | 1.21+ |

#### V2

Expand Down Expand Up @@ -52,8 +53,10 @@ Please refer to [`disk.csi.azure.com` driver parameters](./docs/driver-parameter
### Install driver on a Kubernetes cluster
- install by [helm charts](./charts)
- install by [kubectl](./docs/install-azuredisk-csi-driver.md)
- install open source csi driver on AKS, follow guide [here](./docs/install-driver-on-aks.md)
- install managed csi driver on following platforms:
- install open source CSI driver on following platforms:
- [AKS](./docs/install-driver-on-aks.md)
- [Azure RedHat OpenShift](https://github.com/ezYakaEagle442/aro-pub-storage/blob/master/setup-store-CSI-driver-azure-disk.md)
- install managed CSI driver on following platforms:
- [AKS](https://learn.microsoft.com/en-us/azure/aks/csi-storage-drivers)
- [Azure RedHat OpenShift](https://docs.openshift.com/container-platform/4.11/storage/container_storage_interface/persistent-storage-csi-azure.html)

Expand All @@ -77,6 +80,7 @@ Please refer to [`disk.csi.azure.com` driver parameters](./docs/driver-parameter
- [Shared Disk](./deploy/example/sharedisk)
- [Volume Limits](./deploy/example/volumelimits)
- [fsGroupPolicy](./deploy/example/fsgroup)
- [Workload identity](./docs/workload-identity.md)
- [Advanced disk performance tuning (Preview)](./docs/perf-profiles.md)

#### New in V2
Expand Down

0 comments on commit 7d033aa

Please sign in to comment.