From 1891a632816484b21ce173948904ebf57b103c8c Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Fri, 22 Jul 2022 22:58:42 +0200 Subject: [PATCH] Fix lint errors --- README.md | 2 +- defaults/main.yml | 16 ++-- meta/main.yml | 6 +- tasks/main.yml | 212 +++++++++++++++++++++++----------------------- 4 files changed, 118 insertions(+), 118 deletions(-) diff --git a/README.md b/README.md index a530e0b..9c928d7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Déploie l'usine logiciel dans Kubernetes. - un registre docker (plus tard) [registry docker](https://github.com/cesanta/docker_auth/tree/main/chart/docker-auth) -- un registre de chart helm: [chartmuseum](https://artifacthub.io/packages/helm/chartmuseum/chartmuseum) (Manque l'authentification sur l'API) voir [artifacthub](https://github.com/artifacthub/hub) +- un registre de chart kubernetes.core.helm://github.com/artifacthub/hub) - un scanner de vulnérabilité (plus tard aussi) [clair](https://github.com/quay/clair) avec [klar](https://github.com/optiopay/klar) - [How To: Build Your Own Clair and Docker Registry Environment!](https://www.x-cellent.com/blog/build-your-own-clair-registry/) diff --git a/defaults/main.yml b/defaults/main.yml index bf8adc0..b683e38 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,16 +1,16 @@ my_context: minikube -#traefik_version: "2.1" -#traefik_namespace: traefik +# traefik_version: "2.1" +# traefik_namespace: traefik gitea_namespace: gitea -#gitea_storage_classname: -#gitea_certificate: certificate_secret_name +# gitea_storage_classname: +# gitea_certificate: certificate_secret_name drone_namespace: "drone" -#drone_version: "2" +# drone_version: "2" drone_runner_namespace: "drone-runner" -#drone_certificate: certificate_secret_name -#drone_storage_classname: +# drone_certificate: certificate_secret_name +# drone_storage_classname: trivy_namespace: trivy trivy_version: 0.30.2 -#trivy_storage_classname: +# trivy_storage_classname: chartmuseum_namespace: chartmuseum diff --git a/meta/main.yml b/meta/main.yml index 174a842..c974990 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,6 +6,6 @@ galaxy_info: galaxy_tags: [] license: GPL2 platforms: - - name: kubernetes - version: - - all + - name: kubernetes + version: + - all diff --git a/tasks/main.yml b/tasks/main.yml index f93440a..d90532a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,7 @@ - name: Gitea setup block: - name: Install Gitea dynamic files - k8s: + kubernetes.core.k8s: state: present context: "{{ my_context }}" merge_type: merge @@ -13,7 +13,7 @@ - gitea-IngressRoute.yml.j2 # - gitea-IngressRouteTCP.yml.j2 # - name: Install Gitea static files -# k8s: +# kubernetes.core.k8s: # state: present # context: "{{ my_context }}" # merge_type: merge @@ -40,93 +40,93 @@ # https://github.com/drone/charts/tree/master/charts - name: Drone setup block: - - name: Defined drone repository - kubernetes.core.helm_repository: - name: drone - repo_url: "https://charts.drone.io" - tags: - - drone-server - - drone-runner - - drone + - name: Defined drone repository + kubernetes.core.helm_repository: + name: drone + repo_url: "https://charts.drone.io" + tags: + - drone-server + - drone-runner + - drone - - name: Drone install - kubernetes.core.helm: - context: "{{ my_context }}" - name: drone - chart_ref: drone/drone - release_namespace: "{{ drone_namespace }}" - create_namespace: yes - values: "{{ lookup('template', 'drone-helm-value.yaml.j2') | from_yaml }}" - tags: - - drone-server - - drone + - name: Drone install + kubernetes.core.helm: + context: "{{ my_context }}" + name: drone + chart_ref: drone/drone + release_namespace: "{{ drone_namespace }}" + create_namespace: true + values: "{{ lookup('template', 'drone-helm-value.yaml.j2') | from_yaml }}" + tags: + - drone-server + - drone - - name: Drone Runner install - kubernetes.core.helm: - context: "{{ my_context }}" - name: drone - chart_ref: drone/drone-runner-kube - release_namespace: "{{ drone_runner_namespace }}" - create_namespace: yes - values: "{{ lookup('template', 'drone-runner-helm-value.yaml.j2') | from_yaml }}" - tags: - - drone-runner - - drone + - name: Drone Runner install + kubernetes.core.helm: + context: "{{ my_context }}" + name: drone + chart_ref: drone/drone-runner-kube + release_namespace: "{{ drone_runner_namespace }}" + create_namespace: true + values: "{{ lookup('template', 'drone-runner-helm-value.yaml.j2') | from_yaml }}" + tags: + - drone-runner + - drone # https://github.com/aquasecurity/trivy/tree/main/helm/trivy - name: Trivy Setup block: -# - name: Git clone stable repo on HEAD -# ansible.builtin.git: -# repo: "https://github.com/aquasecurity/trivy.git" -# dest: tmp/trivy -# version: "{{ trivy_version }}" - - name: Defined trivy repository - kubernetes.core.helm_repository: - name: aquasecurity - repo_url: "https://aquasecurity.github.io/helm-charts/" - - name: Deploy trivy chart - kubernetes.core.helm: - state: present - name: trivy - context: "{{ my_context }}" - chart_ref: aquasecurity/trivy - release_namespace: "{{ trivy_namespace }}" - create_namespace: true -# values: -# image: -# tag: "{{ trivy_version }}" -# persistence: -# storageClass: "{{ trivy_storage_classname }}" -# trivy: -# gitHubToken: "" -# cache: -# redis: -# enabled: false -# url: "" # e.g. redis://redis.redis.svc:6379 -# ingress: -# enabled: false -# annotations: {} -# # kubernetes.io/ingress.class: traefik -# hosts: -# - host: trivy.{{ cluster_domain }} +# - name: Git clone stable repo on HEAD +# ansible.builtin.git: +# repo: "https://github.com/aquasecurity/trivy.git" +# dest: tmp/trivy +# version: "{{ trivy_version }}" + - name: Defined trivy repository + kubernetes.core.helm_repository: + name: aquasecurity + repo_url: "https://aquasecurity.github.io/helm-charts/" + - name: Deploy trivy chart + kubernetes.core.helm: + state: present + name: trivy + context: "{{ my_context }}" + chart_ref: aquasecurity/trivy + release_namespace: "{{ trivy_namespace }}" + create_namespace: true +# values: +# image: +# tag: "{{ trivy_version }}" +# persistence: +# storageClass: "{{ trivy_storage_classname }}" +# trivy: +# gitHubToken: "" +# cache: +# redis: +# enabled: false +# url: "" # e.g. redis://redis.redis.svc:6379 +# ingress: +# enabled: false +# annotations: {} +# # kubernetes.io/ingress.class: traefik +# hosts: +# - host: trivy.{{ cluster_domain }} tags: - trivy #- name: Registry setup # block: -# - name: Defined Registry repository -# kubernetes.core.helm_repository: -# name: cesanta -# repo_url: "https://cesanta.github.io/docker_auth/" -# - name: Deploy latest version of Registry -# kubernetes.core.helm: -# context: "{{ my_context }}" -# name: docker-auth -# chart_ref: cesanta/docker-auth -# release_namespace: "{{ registry_namespace }}" -# values: "{{ lookup('template', 'registry-value.yaml.j2') | from_yaml }}" +# - name: Defined Registry repository +# kubernetes.core.helm_repository: +# name: cesanta +# repo_url: "https://cesanta.github.io/docker_auth/" +# - name: Deploy latest version of Registry +# kubernetes.core.helm: +# context: "{{ my_context }}" +# name: docker-auth +# chart_ref: cesanta/docker-auth +# release_namespace: "{{ registry_namespace }}" +# values: "{{ lookup('template', 'registry-value.yaml.j2') | from_yaml }}" # tags: # - registry @@ -134,35 +134,35 @@ # https://artifacthub.io/packages/helm/chartmuseum/chartmuseum - name: ChartMuseum Setup block: - - name: Defined ChartMuseum repository - kubernetes.core.helm_repository: - name: chartmuseum - repo_url: "https://chartmuseum.github.io/charts" - - name: Deploy trivy chart from local path - kubernetes.core.helm: - state: present - name: chartmuseum - context: "{{ my_context }}" - chart_ref: chartmuseum/chartmuseum - release_namespace: "{{ chartmuseum_namespace }}" - create_namespace: true - values: - persistence: - enabled: true -# path: "/storage" -# storageClass: - accessMode: ReadWriteOnce - size: 2Gi - env: - open: - STORAGE: local - extraArgs: [] - ingress: - enabled: true - annotations: {} - labels: {} - hosts[0]: - name: chartmuseum.{{ cluster_domain }} + - name: Defined ChartMuseum repository + kubernetes.core.helm_repository: + name: chartmuseum + repo_url: "https://chartmuseum.github.io/charts" + - name: Deploy trivy chart from local path + kubernetes.core.helm: + state: present + name: chartmuseum + context: "{{ my_context }}" + chart_ref: chartmuseum/chartmuseum + release_namespace: "{{ chartmuseum_namespace }}" + create_namespace: true + values: + persistence: + enabled: true +# path: "/storage" +# storageClass: + accessMode: ReadWriteOnce + size: 2Gi + env: + open: + STORAGE: local + extraArgs: [] + ingress: + enabled: true + annotations: {} + labels: {} + hosts[0]: + name: chartmuseum.{{ cluster_domain }} tags: - chartmuseum