Skip to content

Commit ff0aaa2

Browse files
committed
bug fixes
1 parent b7edc45 commit ff0aaa2

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
.git*
22
examples/**
3+
4+
charts/
5+
*.yaml

kubernetes.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ func watchForPersistentVolumeClaims(watchNamespace string) {
117117
if !provisionedByAwsEbs(newOne) {
118118
return
119119
}
120+
if newOne.Spec.VolumeName == "" {
121+
log.Debugln("Volume not yet created, skipping")
122+
return
123+
}
120124
// TODO: Handle removed tags
121125
log.Infoln("Need to reconcile tags")
122126
volumeID, tags, err := processPersistentVolumeClaim(newOne)
@@ -184,13 +188,11 @@ func buildTags(pvc *corev1.PersistentVolumeClaim) map[string]string {
184188
}
185189

186190
func isValidTagName(name string) bool {
187-
if strings.HasPrefix(name, "kubernetes.io") {
191+
if strings.HasPrefix(strings.ToLower(name), "kubernetes.io") {
188192
return false
189-
}
190-
if name == "Name" {
193+
} else if strings.ToLower(name) == "name" {
191194
return false
192-
}
193-
if name == "KubernetesCluster" {
195+
} else if strings.ToLower(name) == "kubernetescluster" {
194196
return false
195197
}
196198

main.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,19 @@ func main() {
9494
}
9595

9696
if defaultTagsString != "" {
97+
log.Debugln("defaultTagsString:", defaultTagsString)
9798
err := json.Unmarshal([]byte(defaultTagsString), &defaultTags)
9899
if err != nil {
99-
log.Fatalln("default-tags are not valid json key/value pairs")
100+
log.Fatalln("default-tags are not valid json key/value pairs:", err)
100101
}
101102
}
103+
log.Infoln("Default Tags:", defaultTags)
104+
105+
if watchNamespace == "" {
106+
log.Infoln("Watching namespace:", watchNamespace)
107+
} else {
108+
log.Infoln("Watching all namespaces")
109+
}
102110

103111
// Parse AWS_REGION environment variable.
104112
if len(region) == 0 {

0 commit comments

Comments
 (0)