From 04f26bf5810d852684b2e9121e4655c75097ca2e Mon Sep 17 00:00:00 2001 From: Daishan Date: Thu, 10 Dec 2020 22:31:06 -0700 Subject: [PATCH] Update gitjob to v0.1.10, fleet docs to add cabundle and insecureSkipTls --- charts/fleet/charts/gitjob/Chart.yaml | 4 ++-- .../charts/gitjob/templates/clusterrole.yaml | 14 +------------- charts/fleet/charts/gitjob/values.yaml | 2 +- docs/gitrepo-add.md | 15 ++++++++++++--- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/charts/fleet/charts/gitjob/Chart.yaml b/charts/fleet/charts/gitjob/Chart.yaml index 91d22086bf..162a2e4490 100644 --- a/charts/fleet/charts/gitjob/Chart.yaml +++ b/charts/fleet/charts/gitjob/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.1.9 +appVersion: 0.1.10 description: Controller that run jobs based on git events name: gitjob -version: 0.1.9 +version: 0.1.10 diff --git a/charts/fleet/charts/gitjob/templates/clusterrole.yaml b/charts/fleet/charts/gitjob/templates/clusterrole.yaml index c3ee3ac306..d1dee0c8b6 100644 --- a/charts/fleet/charts/gitjob/templates/clusterrole.yaml +++ b/charts/fleet/charts/gitjob/templates/clusterrole.yaml @@ -22,19 +22,7 @@ rules: resources: - 'secrets' verbs: - - 'list' - - 'get' - - 'watch' - - apiGroups: - - "" - resources: - - 'configmaps' - verbs: - - 'create' - - 'list' - - 'get' - - 'update' - - 'watch' + - '*' - apiGroups: - "gitjob.cattle.io" resources: diff --git a/charts/fleet/charts/gitjob/values.yaml b/charts/fleet/charts/gitjob/values.yaml index 86fe0d546e..dae12d0e96 100644 --- a/charts/fleet/charts/gitjob/values.yaml +++ b/charts/fleet/charts/gitjob/values.yaml @@ -1,6 +1,6 @@ gitjob: repository: rancher/gitjob - tag: v0.1.9 + tag: v0.1.10 tekton: repository: rancher/tekton-utils diff --git a/docs/gitrepo-add.md b/docs/gitrepo-add.md index 601978eaf8..0630dcab4d 100644 --- a/docs/gitrepo-add.md +++ b/docs/gitrepo-add.md @@ -48,7 +48,15 @@ spec: # same namespace as the GitRepo # # clientSecretName: my-ssh-key - + # + # To add additional ca-bundle for self-signed certs, caBundle can be filled with base64 encoded pem data. For example: `cat /path/to/ca.pem | base64 -w 0` + # + # caBundle: my-ca-bundle + # + # Disable SSL verification for git repo + # + # insecureSkipTLSVerify: true + # # A git repo can read multiple paths in a repo at once. # The below field is expected to be an array of paths and # supports path globbing (ex: some/*/path) @@ -96,13 +104,13 @@ kubectl create secret generic $name -n $namespace --from-file=ssh-privatekey=/fi Fleet supports putting `known_hosts` into ssh secret. Here is an example of how to add it: -1. Fetch the public key hash(take github as an example) +Fetch the public key hash(take github as an example) ```text ssh-keyscan -H github.com ``` -2. And add it into secret: +And add it into secret: ```text apiVersion: v1 @@ -117,3 +125,4 @@ stringData: ``` Note: If you don't add it any server's public key will be trusted and added. +