Skip to content

Commit

Permalink
Merge pull request #77 from fluxcd/spec/domain-change
Browse files Browse the repository at this point in the history
  • Loading branch information
hiddeco authored Jul 31, 2020
2 parents f61016f + fc65d2c commit baac856
Show file tree
Hide file tree
Showing 28 changed files with 97 additions and 97 deletions.
14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ and can prune resources safely without hitting Kubernetes API rate limits.
## 0.0.1-alpha.6 (2020-05-03)

This alpha release comes with
[role-based access control](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/v1alpha1/kustomization.md#role-based-access-control)
[role-based access control](https://github.com/fluxcd/kustomize-controller/blob/v0.0.1-alpha.6/docs/spec/v1alpha1/kustomization.md#role-based-access-control)
for restricting the execution of a kustomization apply to a specific service account.

## 0.0.1-alpha.5 (2020-04-27)
Expand All @@ -82,19 +82,19 @@ This allows waiting for an on-demand sync to complete.
## 0.0.1-alpha.4 (2020-04-24)

This alpha release introduces a new status field for recording the
[last applied source revision](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/v1alpha1/kustomization.md#status).
[last applied source revision](https://github.com/fluxcd/kustomize-controller/blob/v0.0.1-alpha.4/docs/spec/v1alpha1/kustomization.md#status).

Feature comparison with Flux has been added to
[docs/spec](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/README.md#backward-compatibility).
[docs/spec](https://github.com/fluxcd/kustomize-controller/blob/v0.0.1-alpha.4/docs/spec/README.md#backward-compatibility).

## 0.0.1-alpha.3 (2020-04-23)

This alpha release introduces the option to tell the controller to
[automatically generate](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/v1alpha1/kustomization.md#generate-kustomizationyaml)
[automatically generate](https://github.com/fluxcd/kustomize-controller/blob/v0.0.1-alpha.3/docs/spec/v1alpha1/kustomization.md#generate-kustomizationyaml)
the `kustomization.yaml` for repositories that contain plain Kubernetes manifests.

The controller design and motivation can be found at
[docs/spec](https://github.com/fluxcd/kustomize-controller/tree/master/docs/spec).
[docs/spec](https://github.com/fluxcd/kustomize-controller/tree/v0.0.1-alpha.3/docs/spec).

## 0.0.1-alpha.2 (2020-04-21)

Expand All @@ -104,10 +104,10 @@ that allows grouping
[Kustomization](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/v1alpha1/kustomization.md)
objects and defining a common behavior for them.
The v1alpha1 profiles can be used for
[configuring Slack and Discord alerting](https://github.com/fluxcd/kustomize-controller/tree/master#configure-alerting).
[configuring Slack and Discord alerting](https://github.com/fluxcd/kustomize-controller/tree/v0.0.1-alpha.2#configure-alerting).

## 0.0.1-alpha.1 (2020-04-20)

This is the first alpha release of kustomize controller.
The controller is an implementation of the
[kustomize.fluxcd.io/v1alpha1](https://github.com/fluxcd/kustomize-controller/tree/master/docs/spec/v1alpha1) API.
[kustomize.fluxcd.io/v1alpha1](https://github.com/fluxcd/kustomize-controller/tree/v0.0.1-alpha.1/docs/spec/v1alpha1) API.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
IMG ?= fluxcd/kustomize-controller:latest
# Produce CRDs that work back to Kubernetes 1.16
CRD_OPTIONS ?= crd:crdVersions=v1
SOURCE_VER ?= v0.0.6
SOURCE_VER ?= v0.0.7

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand All @@ -26,7 +26,7 @@ run: generate fmt vet manifests
go run ./main.go

download-crd-deps:
curl -s https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.fluxcd.io_gitrepositories.yaml > config/crd/bases/gitrepositories.yaml
curl -s https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml > config/crd/bases/gitrepositories.yaml

# Install CRDs into a cluster
install: manifests
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
domain: fluxcd.io
domain: toolkit.fluxcd.io
repo: github.com/fluxcd/kustomize-controller
resources:
- group: kustomize
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ tk install
Create a source object that points to a Git repository containing Kubernetes and Kustomize manifests:

```yaml
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: podinfo
Expand Down Expand Up @@ -86,7 +86,7 @@ kubectl -n gitops-system annotate --overwrite gitrepository/podinfo fluxcd.io/re
Create a kustomization object that uses the git repository defined above:

```yaml
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: podinfo-dev
Expand Down Expand Up @@ -193,7 +193,7 @@ When combined with health assessment, a kustomization will run after all its dep
For example, a service mesh proxy injector should be running before deploying applications inside the mesh:

```yaml
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: istio
Expand All @@ -210,7 +210,7 @@ spec:
namespace: istio-system
timeout: 2m
---
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: podinfo-dev
Expand All @@ -231,7 +231,7 @@ spec:
For production deployments, instead of synchronizing with a branch you can use a semver range to target stable releases:

```yaml
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: podinfo-releases
Expand All @@ -249,7 +249,7 @@ that matches the semver range.
Create a production kustomization and reference the git source that follows the latest semver release:

```yaml
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: podinfo-production
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ limitations under the License.

// Package v1alpha1 contains API Schema definitions for the kustomize v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=kustomize.fluxcd.io
// +groupName=kustomize.toolkit.fluxcd.io
package v1alpha1
2 changes: 1 addition & 1 deletion api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "kustomize.fluxcd.io", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "kustomize.toolkit.fluxcd.io", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: kustomizations.kustomize.fluxcd.io
name: kustomizations.kustomize.toolkit.fluxcd.io
spec:
group: kustomize.fluxcd.io
group: kustomize.toolkit.fluxcd.io
names:
kind: Kustomization
listKind: KustomizationList
Expand Down
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- bases/kustomize.fluxcd.io_kustomizations.yaml
- bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml
# +kubebuilder:scaffold:crdkustomizeresource

4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ resources:
- ../crd
- ../rbac
- ../manager
- github.com/fluxcd/source-controller/config//crd?ref=v0.0.6
- github.com/fluxcd/source-controller/config//manager?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.7
- namespace.yaml
4 changes: 2 additions & 2 deletions config/rbac/kustomization_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: kustomization-editor-role
rules:
- apiGroups:
- kustomize.fluxcd.io
- kustomize.toolkit.fluxcd.io
resources:
- kustomizations
verbs:
Expand All @@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- kustomize.fluxcd.io
- kustomize.toolkit.fluxcd.io
resources:
- kustomizations/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/kustomization_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ metadata:
name: kustomization-viewer-role
rules:
- apiGroups:
- kustomize.fluxcd.io
- kustomize.toolkit.fluxcd.io
resources:
- kustomizations
verbs:
- get
- list
- watch
- apiGroups:
- kustomize.fluxcd.io
- kustomize.toolkit.fluxcd.io
resources:
- kustomizations/status
verbs:
Expand Down
8 changes: 4 additions & 4 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: manager-role
rules:
- apiGroups:
- kustomize.fluxcd.io
- kustomize.toolkit.fluxcd.io
resources:
- kustomizations
verbs:
Expand All @@ -19,23 +19,23 @@ rules:
- update
- watch
- apiGroups:
- kustomize.fluxcd.io
- kustomize.toolkit.fluxcd.io
resources:
- kustomizations/status
verbs:
- get
- patch
- update
- apiGroups:
- source.fluxcd.io
- source.toolkit.fluxcd.io
resources:
- gitrepositories
verbs:
- get
- list
- watch
- apiGroups:
- source.fluxcd.io
- source.toolkit.fluxcd.io
resources:
- gitrepositories/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/kustomize_v1alpha1_kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: webapp-dev
Expand All @@ -19,7 +19,7 @@ spec:
namespace: webapp
timeout: 2m
---
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: webapp-production
Expand Down
4 changes: 2 additions & 2 deletions config/samples/source_v1alpha1_gitrepository.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: webapp-latest
Expand All @@ -8,7 +8,7 @@ spec:
ref:
branch: master
---
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: webapp-releases
Expand Down
2 changes: 1 addition & 1 deletion config/testdata/dependencies/backend.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: backend
Expand Down
2 changes: 1 addition & 1 deletion config/testdata/dependencies/common.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: common
Expand Down
2 changes: 1 addition & 1 deletion config/testdata/dependencies/frontend.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: frontend
Expand Down
2 changes: 1 addition & 1 deletion config/testdata/dependencies/source.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: webapp
Expand Down
4 changes: 2 additions & 2 deletions config/testdata/overlays/production.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: webapp-production
Expand All @@ -19,7 +19,7 @@ spec:
namespace: production
timeout: 2m
---
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: webapp-releases
Expand Down
4 changes: 2 additions & 2 deletions config/testdata/overlays/staging.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.fluxcd.io/v1alpha1
apiVersion: kustomize.toolkit.fluxcd.io/v1alpha1
kind: Kustomization
metadata:
name: webapp-staging
Expand All @@ -19,7 +19,7 @@ spec:
namespace: staging
timeout: 2m
---
apiVersion: source.fluxcd.io/v1alpha1
apiVersion: source.toolkit.fluxcd.io/v1alpha1
kind: GitRepository
metadata:
name: webapp-latest
Expand Down
4 changes: 2 additions & 2 deletions controllers/gitrepository_watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ type GitRepositoryWatcher struct {
Scheme *runtime.Scheme
}

// +kubebuilder:rbac:groups=source.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,verbs=get;list;watch
// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories/status,verbs=get

func (r *GitRepositoryWatcher) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
Expand Down
4 changes: 2 additions & 2 deletions controllers/kustomization_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ type KustomizationReconciler struct {
ExternalEventRecorder *recorder.EventRecorder
}

// +kubebuilder:rbac:groups=kustomize.fluxcd.io,resources=kustomizations,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=kustomize.fluxcd.io,resources=kustomizations/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=kustomize.toolkit.fluxcd.io,resources=kustomizations,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=kustomize.toolkit.fluxcd.io,resources=kustomizations/status,verbs=get;update;patch

func (r *KustomizationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()
Expand Down
Loading

0 comments on commit baac856

Please sign in to comment.