makefile tab issue resulted in job crd not being updated

samsung-cnct · Nov 30, 2018 · 9981224 · 9981224
1 parent 9525041
commit 9981224
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/build/Makefile b/build/Makefile
@@ -66,7 +66,7 @@ manifests:
 	output=$$(kustomize build build/kustomize/crd/protected/instances); echo "$$output" > $(PROJECTDIR)/deployments/helm/jenkins-operator/CRD-protected/jenkins_v1alpha1_jenkinsinstance.yaml
 	output=$$(kustomize build build/kustomize/crd/protected/jobs); echo "$$output" > $(PROJECTDIR)/deployments/helm/jenkins-operator/CRD-protected/jenkins_v1alpha1_jenkinsjob.yaml
 	output=$$(kustomize build build/kustomize/crd/unprotected/instances); echo "$$output" > $(PROJECTDIR)/deployments/helm/jenkins-operator/CRD/jenkins_v1alpha1_jenkinsinstance.yaml
-    output=$$(kustomize build build/kustomize/crd/unprotected/jobs); echo "$$output" > $(PROJECTDIR)/deployments/helm/jenkins-operator/CRD/jenkins_v1alpha1_jenkinsjob.yaml
+	output=$$(kustomize build build/kustomize/crd/unprotected/jobs); echo "$$output" > $(PROJECTDIR)/deployments/helm/jenkins-operator/CRD/jenkins_v1alpha1_jenkinsjob.yaml
 
 # label hack for helm templates
 

diff --git a/deployments/helm/jenkins-operator/CRD/jenkins_v1alpha1_jenkinsjob.yaml b/deployments/helm/jenkins-operator/CRD/jenkins_v1alpha1_jenkinsjob.yaml
@@ -3,7 +3,12 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
+    app.kubernetes.io/instance: '{{.Release.Name}}'
+    app.kubernetes.io/managed-by: '{{.Release.Service}}'
+    app.kubernetes.io/name: '{{include "jenkins-operator.name" .}}'
+    app.kubernetes.io/version: '{{.Chart.AppVersion | replace "+" "_" | trunc 63}}'
     controller-tools.k8s.io: "1.0"
+    helm.sh/chart: '{{include "jenkins-operator.chart" .}}'
   name: jenkinsjobs.jenkins.jenkinsoperator.maratoid.github.com
 spec:
   group: jenkins.jenkinsoperator.maratoid.github.com