Support chart repo crd

Author: hangyan

.dockerignore

@@ -1,6 +1,5 @@
 captain
 .kube
 .helm
-artifacts
 docs
 

.gitignore

@@ -1,5 +1,5 @@
 .idea/
-captain
+/captain
 .helm/
 .kube/
 artifacts/coverage.out

Dockerfile

@@ -1,16 +1,17 @@
 FROM golang:1.12.4
 
-COPY . $GOPATH/src/alauda.io/captain
-WORKDIR $GOPATH/src/alauda.io/captain
+COPY . $GOPATH/src/github.com/alauda/captain
+WORKDIR $GOPATH/src/github.com/alauda/captain
 RUN make build
 
 FROM index.alauda.cn/alaudaorg/alaudabase-alpine-run:alpine3.9.3
 
 WORKDIR /captain
 
-COPY --from=0 /go/src/alauda.io/captain/captain /captain/
-COPY hack/run.sh /captain/run.sh
-RUN chmod a+x /captain/captain /captain/run.sh
+COPY --from=0 /go/src/github.com/alauda/captain/captain /captain/
+COPY artifacts/helm/repositories.yaml /captain/.helm/repository/
+RUN chmod a+x /captain/captain
 
-ENTRYPOINT ["/captain/run.sh"]
+
+# ENTRYPOINT ["/captain/run.sh"]
 CMD ["/captain/captain"]

README.md

@@ -14,6 +14,7 @@ released yet, we add some little medication to help create this controller. Of c
 
 ## Features
 * HelmRequest and Release CRD, namespace based
+* ChartRepo CRD
 * Multi cluster support based on [https://github.com/kubernetes/cluster-registry](https://github.com/kubernetes/cluster-registry)
 * Dependency check for HelmRequest (between HelmRequests)
 * `valuesFrom` support, also use ConfigMap or Secret to store values
@@ -54,6 +55,7 @@ For the detailed explain and advanced usage, please check the documentation belo
 * [How captain works](./docs/captain.md)
 * [HelmRequest CRD](./docs/helmrequest.md)
 * [Release CRD](./docs/release.md)
+* [ChartRepo CRD](./docs/chartrepo.md)
 
 
 

artifacts/crd/chartrepo/alauda.yaml

@@ -0,0 +1,6 @@
+apiVersion: app.alauda.io/v1alpha1
+kind: ChartRepo
+metadata:
+  name: alauda
+spec:
+  url: https://alauda.github.io/charts

artifacts/crd/chartrepo/stable.yaml

@@ -0,0 +1,6 @@
+apiVersion: app.alauda.io/v1alpha1
+kind: ChartRepo
+metadata:
+  name: stable
+spec:
+  url: https://kubernetes-charts.storage.googleapis.com

charts/captain/Chart.yaml

@@ -1,4 +1,4 @@
 name: captain
 appVersion: "2.0"
-version: v0.8.0
+version: v0.9.0
 description: A Helm3 Controller

charts/captain/templates/chartrepo.yaml

@@ -0,0 +1,34 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: chartrepos.app.alauda.io
+spec:
+  group: app.alauda.io
+  version: v1alpha1
+  names:
+    kind: ChartRepo
+    listKind: ChartRepoList
+    plural: chartrepos
+    singular: chartrepo
+    shortNames:
+      - ctr
+  additionalPrinterColumns:
+    - name: URL
+      type: string
+      description: The url of this chart repo
+      JSONPath: .spec.url
+    - name: Phase
+      type: string
+      description: The phase of this ChartRepo
+      JSONPath: .status.phase
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
+  scope: Namespaced
+  validation:
+    # openAPIV3Schema is the schema for validating custom objects.
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - url

charts/captain/templates/configmap.yaml

@@ -17,21 +17,16 @@ spec:
           image: "{{ .Values.global.images.captain.repository }}:{{ .Values.global.images.captain.tag }}"
           terminationMessagePolicy: File
           imagePullPolicy: {{ .Values.image.policy }}
-          args:
+          command:
             - /captain/captain
             - -cluster-namespace={{ .Values.namespace }}
+            - -chartrepo-namespace={{ .Values.namespace }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
-          - name: config-volume
-            mountPath: /tmp/repositories.yaml
-            subPath: repositories.yaml
           - name: certs
             mountPath: /tmp/k8s-webhook-server/serving-certs
       volumes:
-      - name: config-volume
-        configMap:
-          name: captain
       - name: certs
         secret:
           optional: true