opensource/flux2
1
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2025-11-03 11:21:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from fluxcd/update-components

Browse Source 
Update components
This commit is contained in:
Hidde Beydals
2020-07-31 12:17:37 +02:00
committed by GitHub
parent 50d2eb7d57 54b11e7b25
commit 2d417f200d
13 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/docs.yaml vendored
View File

@ -13,27 +13,32 @@ jobs:
- name: Checkout master - name: Checkout master
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Copy assets - name: Copy assets
env:
SOURCE_VER: ${{ 'v0.0.7' }}
KUSTOMIZE_VER: ${{ 'v0.0.7' }}
HELM_VER: ${{ 'v0.0.1' }}
NOTIFICATION_VER: ${{ 'v0.0.6' }}
run: | run: |
# source-controller CRDs # source-controller CRDs
curl https://raw.githubusercontent.com/fluxcd/source-controller/master/docs/api/source.md > docs/components/source/api.md curl "https://raw.githubusercontent.com/fluxcd/source-controller/$SOURCE_VER/docs/api/source.md" > docs/components/source/api.md
curl https://raw.githubusercontent.com/fluxcd/source-controller/master/docs/spec/v1alpha1/gitrepositories.md > docs/components/source/gitrepositories.md curl "https://raw.githubusercontent.com/fluxcd/source-controller/$SOURCE_VER/docs/spec/v1alpha1/gitrepositories.md" > docs/components/source/gitrepositories.md
curl https://raw.githubusercontent.com/fluxcd/source-controller/master/docs/spec/v1alpha1/helmrepositories.md > docs/components/source/helmrepositories.md curl "https://raw.githubusercontent.com/fluxcd/source-controller/$SOURCE_VER/docs/spec/v1alpha1/helmrepositories.md" > docs/components/source/helmrepositories.md
curl https://raw.githubusercontent.com/fluxcd/source-controller/master/docs/spec/v1alpha1/helmcharts.md > docs/components/source/helmcharts.md curl "https://raw.githubusercontent.com/fluxcd/source-controller/$SOURCE_VER/docs/spec/v1alpha1/helmcharts.md" > docs/components/source/helmcharts.md
# kustomize-controller CRDs # kustomize-controller CRDs
curl https://raw.githubusercontent.com/fluxcd/kustomize-controller/master/docs/api/kustomize.md > docs/components/kustomize/api.md curl "https://raw.githubusercontent.com/fluxcd/kustomize-controller/$KUSTOMIZE_VER/docs/api/kustomize.md" > docs/components/kustomize/api.md
curl https://raw.githubusercontent.com/fluxcd/kustomize-controller/master/docs/spec/v1alpha1/kustomization.md > docs/components/kustomize/kustomization.md curl "https://raw.githubusercontent.com/fluxcd/kustomize-controller/$KUSTOMIZE_VER/docs/spec/v1alpha1/kustomization.md" > docs/components/kustomize/kustomization.md
# helm-controller CRDs # helm-controller CRDs
curl https://raw.githubusercontent.com/fluxcd/helm-controller/master/docs/api/helmrelease.md > docs/components/helm/api.md curl "https://raw.githubusercontent.com/fluxcd/helm-controller/$HELM_VER/docs/api/helmrelease.md" > docs/components/helm/api.md
curl https://raw.githubusercontent.com/fluxcd/helm-controller/master/docs/spec/v2alpha1/helmreleases.md > docs/components/helm/helmreleases.md curl "https://raw.githubusercontent.com/fluxcd/helm-controller/$HELM_VER/docs/spec/v2alpha1/helmreleases.md" > docs/components/helm/helmreleases.md
# notification-controller CRDs # notification-controller CRDs
curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/api/notification.md > docs/components/notification/api.md curl "https://raw.githubusercontent.com/fluxcd/notification-controller/$NOTIFICATION_VER/docs/api/notification.md" > docs/components/notification/api.md
curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/event.md > docs/components/notification/event.md curl "https://raw.githubusercontent.com/fluxcd/notification-controller/$NOTIFICATION_VER/docs/spec/v1alpha1/event.md" > docs/components/notification/event.md
curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/alert.md > docs/components/notification/alert.md curl "https://raw.githubusercontent.com/fluxcd/notification-controller/$NOTIFICATION_VER/docs/spec/v1alpha1/alert.md" > docs/components/notification/alert.md
curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/provider.md > docs/components/notification/provider.md curl "https://raw.githubusercontent.com/fluxcd/notification-controller/$NOTIFICATION_VER/docs/spec/v1alpha1/provider.md" > docs/components/notification/provider.md
curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/receiver.md > docs/components/notification/receiver.md curl "https://raw.githubusercontent.com/fluxcd/notification-controller/$NOTIFICATION_VER/docs/spec/v1alpha1/receiver.md" > docs/components/notification/receiver.md
# install script # install script
cp install/tk.sh docs/install.sh cp install/tk.sh docs/install.sh

4
docs/dev-guides/source-watcher.md
View File

@ -131,8 +131,8 @@ type GitRepositoryWatcher struct {
Scheme *runtime.Scheme Scheme *runtime.Scheme
} }
// +kubebuilder:rbac:groups=source.fluxcd.io,resources=gitrepositories,verbs=get;list;watch // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories,verbs=get;list;watch
// +kubebuilder:rbac:groups=source.fluxcd.io,resources=gitrepositories/status,verbs=get // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories/status,verbs=get
func (r *GitRepositoryWatcher) Reconcile(req ctrl.Request) (ctrl.Result, error) { func (r *GitRepositoryWatcher) Reconcile(req ctrl.Request) (ctrl.Result, error) {
// set timeout for the reconciliation // set timeout for the reconciliation

8
docs/guides/helmreleases.md
View File

@ -27,7 +27,7 @@ By default, the source-controller watches for sources only in the
untrusted sources from being registered by users. untrusted sources from being registered by users.
```yaml ```yaml
apiVersion: source.fluxcd.io/v1alpha1 apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: HelmRepository kind: HelmRepository
metadata: metadata:
name: podinfo name: podinfo
@ -55,7 +55,7 @@ With the `HelmRepository` created, define a new `HelmRelease` to deploy
the Helm chart from the repository: the Helm chart from the repository:
```yaml ```yaml
apiVersion: helm.fluxcd.io/v2alpha1 apiVersion: helm.toolkit.fluxcd.io/v2alpha1
kind: HelmRelease kind: HelmRelease
metadata: metadata:
name: podinfo name: podinfo
@ -105,7 +105,7 @@ the `gitops-system` to start receiving notifications about the Helm
release: release:
```yaml ```yaml
apiVersion: notification.fluxcd.io/v1alpha1 apiVersion: notification.toolkit.fluxcd.io/v1alpha1
kind: Alert kind: Alert
metadata: metadata:
generation: 2 generation: 2
@ -147,7 +147,7 @@ kubectl -n gitops-system create secret generic webhook-token \
When using [Harbor](https://goharbor.io/) as your Helm repository, you can define a receiver with: When using [Harbor](https://goharbor.io/) as your Helm repository, you can define a receiver with:
```yaml ```yaml
apiVersion: notification.fluxcd.io/v1alpha1 apiVersion: notification.toolkit.fluxcd.io/v1alpha1
kind: Receiver kind: Receiver
metadata: metadata:
name: helm-podinfo name: helm-podinfo

4
docs/guides/notifications.md
View File

@ -30,7 +30,7 @@ it can be a Slack, Microsoft Teams, Discord or Rocket webhook URL.
Create a notification provider for Slack by referencing the above secret: Create a notification provider for Slack by referencing the above secret:
```yaml ```yaml
apiVersion: notification.fluxcd.io/v1alpha1 apiVersion: notification.toolkit.fluxcd.io/v1alpha1
kind: Provider kind: Provider
metadata: metadata:
name: slack name: slack
@ -54,7 +54,7 @@ Elasticsearch, CloudWatch, Stackdriver, etc.
Create an alert definition for all repositories and kustomizations: Create an alert definition for all repositories and kustomizations:
```yaml ```yaml
apiVersion: notification.fluxcd.io/v1alpha1 apiVersion: notification.toolkit.fluxcd.io/v1alpha1
kind: Alert kind: Alert
metadata: metadata:
name: on-call-webapp name: on-call-webapp

4
docs/guides/sealed-secrets.md
View File

@ -116,7 +116,7 @@ to the fleet repository.
Helm repository manifest: Helm repository manifest:
```yaml ```yaml
apiVersion: source.fluxcd.io/v1alpha1 apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: HelmRepository kind: HelmRepository
metadata: metadata:
name: stable name: stable
@ -129,7 +129,7 @@ spec:
Helm release manifest: Helm release manifest:
```yaml ```yaml
apiVersion: helm.fluxcd.io/v2alpha1 apiVersion: helm.toolkit.fluxcd.io/v2alpha1
kind: HelmRelease kind: HelmRelease
metadata: metadata:
name: sealed-secrets name: sealed-secrets

4
docs/guides/webhook-receivers.md
View File

@ -58,7 +58,7 @@ watch kubectl -n gitops-system get svc/receiver
Create a Git source pointing to a GitHub repository that you have control over: Create a Git source pointing to a GitHub repository that you have control over:
```yaml ```yaml
apiVersion: source.fluxcd.io/v1alpha1 apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository kind: GitRepository
metadata: metadata:
name: webapp name: webapp
@ -89,7 +89,7 @@ kubectl -n gitops-system create secret generic webhook-token \
Create a receiver for GitHub and specify the `GitRepository` object: Create a receiver for GitHub and specify the `GitRepository` object:
```yaml ```yaml
apiVersion: notification.fluxcd.io/v1alpha1 apiVersion: notification.toolkit.fluxcd.io/v1alpha1
kind: Receiver kind: Receiver
metadata: metadata:
name: webapp name: webapp

6
go.mod
View File

@ -4,10 +4,10 @@ go 1.14
require ( require (
github.com/blang/semver v3.5.1+incompatible github.com/blang/semver v3.5.1+incompatible
github.com/fluxcd/helm-controller v0.0.1-beta.4 github.com/fluxcd/helm-controller v0.0.1
github.com/fluxcd/kustomize-controller v0.0.5 github.com/fluxcd/kustomize-controller v0.0.7
github.com/fluxcd/pkg v0.0.3 github.com/fluxcd/pkg v0.0.3
github.com/fluxcd/source-controller v0.0.6 github.com/fluxcd/source-controller v0.0.7
github.com/manifoldco/promptui v0.7.0 github.com/manifoldco/promptui v0.7.0
github.com/spf13/cobra v1.0.0 github.com/spf13/cobra v1.0.0
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect

12
go.sum
View File

@ -172,14 +172,14 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwC
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fluxcd/helm-controller v0.0.1-beta.4 h1:Go7ZGI91BY6A69Qp9TdJg3nufaahQCYhpj7Lum9oyKA= github.com/fluxcd/helm-controller v0.0.1 h1:vTAbVJbn6MX8YAMPQ+zeiGV2CwX75YjF1Yxd8veng7c=
github.com/fluxcd/helm-controller v0.0.1-beta.4/go.mod h1:asoN9pG8J0oQ9iXpkxNwvch1EKspus6RxH818ZYVo+4= github.com/fluxcd/helm-controller v0.0.1/go.mod h1:TLmobkvkb44l/R3J9MZsO0ht4nUX7plO5hWj4qTrhgI=
github.com/fluxcd/kustomize-controller v0.0.5 h1:jjBJT/UbblMaeQpYn5TjH/oXXnORO6C3Cka77bs9K3Q= github.com/fluxcd/kustomize-controller v0.0.7 h1:bIBT5s6jnRjUEOp+AdgQNGpQBZHMBJV/Ak1bK1qtRSM=
github.com/fluxcd/kustomize-controller v0.0.5/go.mod h1:1O78f9Qigs74BMxO/ThzLt5XGGQnwQPgzi+47ntie5M= github.com/fluxcd/kustomize-controller v0.0.7/go.mod h1:GVZs7l+0iI/N6ly0ftNzD5cZqJTmd+BPbsy445hklpU=
github.com/fluxcd/pkg v0.0.3 h1:yhjtpGtD9LxFo8JtwTuUxJyFcX2wSSb0TPptIEpGSmA= github.com/fluxcd/pkg v0.0.3 h1:yhjtpGtD9LxFo8JtwTuUxJyFcX2wSSb0TPptIEpGSmA=
github.com/fluxcd/pkg v0.0.3/go.mod h1:rtlppQU+9DNikyDZptLdOeTf+wBvQQiQQ/J113FPoeU= github.com/fluxcd/pkg v0.0.3/go.mod h1:rtlppQU+9DNikyDZptLdOeTf+wBvQQiQQ/J113FPoeU=
github.com/fluxcd/source-controller v0.0.6 h1:8yBdy5ZQmM4jZWHDBDgysftZnC1mybyfkV7NRzCo5Kc= github.com/fluxcd/source-controller v0.0.7 h1:D17Le7bc+53deRA3EMJc9eB/uU2HqvkMCwILE5HRhPk=
github.com/fluxcd/source-controller v0.0.6/go.mod h1:XZR988ahVLjbqfe0EUq2Zl7bYH2NBly3u0n7DY5XtyU= github.com/fluxcd/source-controller v0.0.7/go.mod h1:XZR988ahVLjbqfe0EUq2Zl7bYH2NBly3u0n7DY5XtyU=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=

4
manifests/bases/helm-controller/kustomization.yaml
View File

@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.1-beta.4 - github.com/fluxcd/helm-controller/config//crd?ref=v0.0.1
- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.1-beta.4 - github.com/fluxcd/helm-controller/config//manager?ref=v0.0.1
patchesJson6902: patchesJson6902:
- target: - target:
group: apps group: apps

4
manifests/bases/kustomize-controller/kustomization.yaml
View File

@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.6 - github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.7
- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.6 - github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.7
patchesJson6902: patchesJson6902:
- target: - target:
group: apps group: apps

4
manifests/bases/notification-controller/kustomization.yaml
View File

@ -1,5 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.5 - github.com/fluxcd/notification-controller/config//crd?ref=v0.0.6
- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.5 - github.com/fluxcd/notification-controller/config//manager?ref=v0.0.6

4
manifests/bases/source-controller/kustomization.yaml
View File

@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- github.com/fluxcd/source-controller/config//crd?ref=v0.0.6 - github.com/fluxcd/source-controller/config//crd?ref=v0.0.7
- github.com/fluxcd/source-controller/config//manager?ref=v0.0.6 - github.com/fluxcd/source-controller/config//manager?ref=v0.0.7
patchesJson6902: patchesJson6902:
- target: - target:
group: apps group: apps

8
manifests/rbac/role.yaml
View File

@ -3,16 +3,16 @@ kind: Role
metadata: metadata:
name: crd-controller name: crd-controller
rules: rules:
- apiGroups: ['source.fluxcd.io'] - apiGroups: ['source.toolkit.fluxcd.io']
resources: ['*'] resources: ['*']
verbs: ['*'] verbs: ['*']
- apiGroups: ['kustomize.fluxcd.io'] - apiGroups: ['kustomize.toolkit.fluxcd.io']
resources: ['*'] resources: ['*']
verbs: ['*'] verbs: ['*']
- apiGroups: ['helm.fluxcd.io'] - apiGroups: ['helm.toolkit.fluxcd.io']
resources: ['*'] resources: ['*']
verbs: ['*'] verbs: ['*']
- apiGroups: ['notification.fluxcd.io'] - apiGroups: ['notification.toolkit.fluxcd.io']
resources: ['*'] resources: ['*']
verbs: ['*'] verbs: ['*']
- apiGroups: - apiGroups: