Merge pull request #5 from jacobwolfaws/main

Adding support for dynamic provisioning

Author: k8s-ci-robot

Dockerfile

@@ -1,3 +1,17 @@
+#Copyright 2022 The Kubernetes Authors
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+
 FROM --platform=$BUILDPLATFORM golang:1.19.0-bullseye as builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-file-cache-csi-driver
 ADD . .

Makefile

@@ -1,3 +1,17 @@
+#Copyright 2022 The Kubernetes Authors
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+
 VERSION=0.1.0
 
 PKG=github.com/kubernetes-sigs/aws-file-cache-csi-driver
@@ -12,7 +26,7 @@ GOPATH=$(shell go env GOPATH)
 GOOS=$(shell go env GOOS)
 GOBIN=$(shell pwd)/bin
 
-IMAGE?=648284600874.dkr.ecr.us-east-1.amazonaws.com/aws-file-cache-csi-driver
+IMAGE?=651262257939.dkr.ecr.us-east-1.amazonaws.com/file-cache-dynamic-provisioning
 TAG?=$(GIT_COMMIT)
 
 OUTPUT_TYPE?=docker

all-push

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Kubernetes Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package main
 
 import (

cmd/main.go

@@ -30,25 +30,14 @@ spec:
           tolerationSeconds: 300
       containers:
         - name: file-cache-plugin
-          image: 648284600874.dkr.ecr.us-east-1.amazonaws.com/aws-file-cache-csi-driver:v0.0.1
-          args :
+          image: 651262257939.dkr.ecr.us-east-1.amazonaws.com/file-cache-dynamic-provisioning:v0.0.25
+          imagePullPolicy: IfNotPresent
+          args:
             - --endpoint=$(CSI_ENDPOINT)
             - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: aws-secret
-                  key: key_id
-                  optional: true
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: aws-secret
-                  key: access_key
-                  optional: true
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -87,4 +76,4 @@ spec:
               mountPath: /csi
       volumes:
         - name: socket-dir
-          emptyDir: {}
+          emptyDir: {}

deploy/kubernetes/base/controller-deployment.yaml

@@ -1,5 +1,4 @@
 ---
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -36,7 +35,6 @@ rules:
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]
     verbs: ["get", "watch", "list", "delete", "update", "create"]
-
 ---
 
 kind: ClusterRoleBinding
@@ -54,3 +52,4 @@ roleRef:
   name: file-cache-csi-external-provisioner-role
   apiGroup: rbac.authorization.k8s.io
 ---
+

deploy/kubernetes/base/controller-serviceaccount.yaml

@@ -1,5 +1,4 @@
 ---
-
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -33,7 +32,8 @@ spec:
         - name: file-cache-plugin
           securityContext:
             privileged: true
-          image: 648284600874.dkr.ecr.us-east-1.amazonaws.com/aws-file-cache-csi-driver:v0.0.1
+          image: 651262257939.dkr.ecr.us-east-1.amazonaws.com/file-cache-dynamic-provisioning:v0.0.25
+          imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
@@ -100,4 +100,4 @@ spec:
         - name: plugin-dir
           hostPath:
             path: /var/lib/kubelet/plugins/filecache.csi.aws.com/
-            type: DirectoryOrCreate
+            type: DirectoryOrCreate

deploy/kubernetes/base/node-daemonset.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+  - name: 651262257939.dkr.ecr.us-east-1.amazonaws.com/file-cache-dynamic-provisioning
+    newName: 651262257939.dkr.ecr.us-east-1.amazonaws.com/file-cache-dynamic-provisioning
+    newTag: v0.0.25