Add Argo CD installation support (#71)

* Add Argo CD installation support

* Update the clusterRole ks-devops

* Bump the chart version from 0.1.9 to 0.1.10

Author: LinuxSuRen

README.md

@@ -20,6 +20,20 @@ you can then do
 
 ```bash
 helm search repo ks-devops
+helm install devops ks-devops/ks-devops --namespace kubesphere-devops-system --create-namespace
+```
+
+## Argo CD support
+Install it via the following instructions:
+
+```shell
+helm repo add argo https://argoproj.github.io/argo-helm
+helm install argocd --version 4.4.0 argo/argo-cd --namespace argocd --create-namespace
+```
+
+or, you could use the following instrctions to unintall it:
+```shell
+helm uninstall --namespace argocd argocd
 ```
 
 ## Configuration

charts/ks-devops/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.9
+version: 0.1.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/ks-devops/crds/devops.kubesphere.io_gitrepositories.yaml

@@ -0,0 +1,81 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  creationTimestamp: null
+  name: gitrepositories.devops.kubesphere.io
+spec:
+  group: devops.kubesphere.io
+  names:
+    kind: GitRepository
+    listKind: GitRepositoryList
+    plural: gitrepositories
+    singular: gitrepository
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.server
+      name: Server
+      type: string
+    name: v1alpha3
+    schema:
+      openAPIV3Schema:
+        description: GitRepository is the Schema for the webhook API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: GitRepositorySpec represents the desired state of a GitRepository
+            properties:
+              provider:
+                type: string
+              secret:
+                description: SecretReference represents a Secret Reference. It has
+                  enough information to retrieve secret in any namespace
+                properties:
+                  name:
+                    description: Name is unique within a namespace to reference a
+                      secret resource.
+                    type: string
+                  namespace:
+                    description: Namespace defines the space within which the secret
+                      name must be unique.
+                    type: string
+                type: object
+              url:
+                type: string
+              webhooks:
+                items:
+                  description: LocalObjectReference contains enough information to
+                    let you locate the referenced object inside the same namespace.
+                  properties:
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        TODO: Add other useful fields. apiVersion, kind, uid?'
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/ks-devops/crds/gitops.kubesphere.io_applications.yaml

@@ -38,6 +38,7 @@ spec:
             properties:
               argoApp:
                 description: ArgoApplication is a definition of Argo Application resource.
+                  Those fields simply are copied from the argo-cd project
                 properties:
                   operation:
                     description: Operation contains information about a requested
@@ -455,7 +456,6 @@ spec:
                     type: object
                   spec:
                     description: ArgoApplicationSpec represents an ArgoCD Application
-                      The fields simply are copied from the argo-cd project
                     properties:
                       destination:
                         description: Destination is a reference to the target Kubernetes

charts/ks-devops/templates/deployment-apiserver.yaml

@@ -58,6 +58,10 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.apiserver.repository }}:{{ .Values.image.apiserver.tag | default .Chart.AppVersion }}"
+          {{- if .Values.argocd.enabled }}
+          args:
+          - --argocd-namespace={{ .Values.argocd.namespace }}
+          {{- end}}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090

charts/ks-devops/templates/deployment-controller.yaml

@@ -47,6 +47,12 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.controller.repository }}:{{ .Values.image.controller.tag | default .Chart.AppVersion }}"
+          {{- if .Values.argocd.enabled }}
+          args:
+          - --enabled-controllers
+          - argocd=true
+          - --argocd-namespace={{ .Values.argocd.namespace }}
+          {{- end}}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

charts/ks-devops/templates/serviceaccount.yaml

@@ -51,8 +51,10 @@ rules:
   - secrets
   verbs:
   - create
+  - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
@@ -69,6 +71,7 @@ rules:
   - applications
   verbs:
   - create
+  - delete
   - get
   - list
   - update
@@ -156,6 +159,8 @@ rules:
   resources:
   - devopsprojects
   verbs:
+  - create
+  - delete
   - get
   - list
   - update
@@ -165,8 +170,11 @@ rules:
   resources:
   - gitrepositories
   verbs:
+  - create
+  - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:

charts/ks-devops/values.yaml

@@ -95,3 +95,7 @@ s2i:
 
 jenkins:
   enabled: true
+
+argocd:
+  enabled: true
+  namespace: argocd

hack/fetch-crds.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-crds=("devops.kubesphere.io_devopsprojects.yaml devops.kubesphere.io_pipelines.yaml devops.kubesphere.io_pipelineruns.yaml devops.kubesphere.io_templates.yaml devops.kubesphere.io_clustertemplates.yaml gitops.kubesphere.io_applications.yaml")
+crds=("devops.kubesphere.io_devopsprojects.yaml devops.kubesphere.io_pipelines.yaml devops.kubesphere.io_pipelineruns.yaml devops.kubesphere.io_templates.yaml devops.kubesphere.io_clustertemplates.yaml gitops.kubesphere.io_applications.yaml devops.kubesphere.io_gitrepositories.yaml")
 for crd in $crds
 do
     curl -sSL -o charts/ks-devops/crds/$crd https://ghproxy.com/https://raw.githubusercontent.com/kubesphere/ks-devops/master/config/crd/bases/$crd