reading resources from Values

.gitignore

@@ -0,0 +1,35 @@
+# General files for the project
+pkg/*
+*.pyc
+bin/*
+.project
+/.bin
+/_test/secrets/*.json
+
+# OSX leaves these everywhere on SMB shares
+._*
+
+# OSX trash
+.DS_Store
+
+# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
+.idea/
+*.iml
+
+# Vscode files
+.vscode
+
+# Emacs save files
+*~
+\#*\#
+.\#*
+
+# Vim-related files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+
+# Chart dependencies
+**/charts/*.tgz

incubator/artifactory/README.md

@@ -30,8 +30,10 @@ $ helm install --name my-release incubator/artifactory
 Deletion of the PetSet doesn't cascade to deleting associated Pods and PVCs. To delete them:
 
 ```
-$ kubectl delete pods -l release=my-release,type=data
-$ kubectl delete pvcs -l release=my-release,type=data
+$ grace=$(kubectl get po artifactory --template '{{.spec.terminationGracePeriodSeconds}}')
+$ kubectl delete petset,po -l app=artifactory
+$ sleep $grace
+$ kubectl delete pvc -l app=artifactory
 ```
 
 ## Configuration

incubator/artifactory/templates/deployment.yaml

@@ -31,9 +31,7 @@ spec:
         image: "{{default "docker.bintray.io/jfrog/artifactory-pro" .Values.image}}:{{default "4.13.2" .Values.imageTag}}"
         imagePullPolicy: {{default "IfNotPresent" .Values.pullPolicy}}
         resources:
-          requests:
-            cpu: {{default "200m" .Values.Cpu}}
-            memory: {{default "2048M" .Values.Memory}}
+{{ toYaml .Values.resources | indent 10 }}
         ports:
         - containerPort: 8081
           name: http

incubator/artifactory/values.yaml

@@ -11,3 +11,7 @@ ImagePullPolicy: "Always"
 replicaCount: 1
 # For minikube, set this to NodePort, elsewhere use LoadBalancer
 ServiceType: LoadBalancer
+resources:
+  requests:
+    memory: 2048Mi
+    cpu: 200m