Skip to content

Commit 82470b0

Browse files
committed
UPSTREAM: <carry>: Add OpenShift files
1 parent 9c0b578 commit 82470b0

File tree

7 files changed

+34
-107
lines changed

7 files changed

+34
-107
lines changed

.ci-operator.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
build_root_image:
2+
name: release
3+
namespace: openshift
4+
tag: rhel-8-release-golang-1.20-openshift-4.15

.github/PULL_REQUEST_TEMPLATE.md

-40
This file was deleted.

Dockerfile.openshift

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
2+
WORKDIR /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver
3+
COPY . .
4+
# Skip Windows driver build
5+
RUN make gce-pd-driver
6+
7+
FROM registry.ci.openshift.org/ocp/4.15:base
8+
9+
# Get all deps
10+
# nvme-cli and /usr/bin/xxd are deps of google_nvme_id
11+
RUN yum update -y && \
12+
yum install --setopt=tsflags=nodocs -y e2fsprogs xfsprogs util-linux systemd-udev nvme-cli /usr/bin/xxd && \
13+
yum clean all && rm -rf /var/cache/yum/* && \
14+
mkdir -p /lib/udev_containerized && cp /usr/lib/udev/scsi_id /lib/udev_containerized/scsi_id # The driver assumes this path
15+
16+
COPY --from=builder /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /usr/bin/
17+
COPY --from=builder /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/deploy/kubernetes/udev/google_nvme_id /lib/udev_containerized/google_nvme_id
18+
ENTRYPOINT ["/usr/bin/gce-pd-csi-driver"]

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ endif
3737
all: gce-pd-driver gce-pd-driver-windows
3838
gce-pd-driver: require-GCE_PD_CSI_STAGING_VERSION
3939
mkdir -p bin
40-
CGO_ENABLED=0 go build -mod=vendor -gcflags=$(GCFLAGS) -ldflags "-extldflags=static -X main.version=$(STAGINGVERSION)" -o bin/${DRIVERBINARY} ./cmd/gce-pd-csi-driver/
40+
# OpenShift carry: remove -extldflags=static to compile with FIPS OpenSSL
41+
CGO_ENABLED=0 go build -mod=vendor -gcflags=$(GCFLAGS) -ldflags "-X main.version=$(STAGINGVERSION)" -o bin/${DRIVERBINARY} ./cmd/gce-pd-csi-driver/
4142

4243
gce-pd-driver-windows: require-GCE_PD_CSI_STAGING_VERSION
4344
ifeq (${GOARCH}, amd64)

OWNERS

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
reviewers:
2-
- amacaskill
3-
- leiyiz
4-
- mattcary
5-
- msau42
6-
- saikat-royc
7-
- sunnylovestiramisu
8-
- pwschuurman
9-
- tyuchn
101
approvers:
11-
- amacaskill
12-
- leiyiz
13-
- mattcary
14-
- msau42
15-
- saikat-royc
16-
- sunnylovestiramisu
17-
- pwschuurman
18-
- tyuchn
19-
emeritus_reviewers:
20-
- davidz627
21-
- jingxu97
22-
- saad-ali
2+
- openshift-storage-maintainers
3+
component: "Storage / Kubernetes External Components"
+8-37
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,9 @@
1-
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
2-
31
aliases:
4-
5-
# SIG-Storage chairs and leads should always have approval rights in all repos.
6-
# Others may be added as needed here or in each repo.
7-
kubernetes-csi-approvers:
8-
- jsafrane
9-
- msau42
10-
- saad-ali
11-
- xing-yang
12-
13-
# Reviewers are automatically assigned to new PRs. The following
14-
# reviewers will be active in all repos. Other reviewers can be
15-
# added in each repo.
16-
#
17-
# Reviewers are encouraged to set the "Busy" flag in their GitHub status
18-
# when they are temporarily unable to review PRs.
19-
kubernetes-csi-reviewers:
20-
- andyzhangx
21-
- chrishenzie
22-
- ggriffiths
23-
- gnufied
24-
- humblec
25-
- j-griffith
26-
- Jiawei0227
27-
- jingxu97
28-
- jsafrane
29-
- pohly
30-
- RaunakShah
31-
- xing-yang
32-
33-
# This documents who previously contributed to Kubernetes-CSI
34-
# as approver.
35-
emeritus_approvers:
36-
- lpabon
37-
- sbezverk
38-
- vladimirvivien
2+
openshift-storage-maintainers:
3+
- jsafrane
4+
- tsmetana
5+
- gnufied
6+
- bertinatto
7+
- dobsonj
8+
- RomanBednar
9+
- mpatlasov

release-tools/OWNERS

-8
This file was deleted.

0 commit comments

Comments
 (0)