Skip to content

Commit c637b3a

Browse files
committed
Merge pull request #22 from fluxcd/release-v0.0.1-alpha.5
Release v0.0.1-alpha.5
2 parents a64fc01 + e644b4f commit c637b3a

File tree

8 files changed

+43
-10
lines changed

8 files changed

+43
-10
lines changed

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Load test image
4747
run: kind load docker-image test/kustomize-controller:latest
4848
- name: Deploy source-controller
49-
run: kustomize build https://github.com/fluxcd/source-controller//config/default?ref=v0.0.1-alpha.1 | kubectl apply -f-
49+
run: kustomize build https://github.com/fluxcd/source-controller//config/default?ref=v0.0.1-alpha.3 | kubectl apply -f-
5050
- name: Deploy kustomize-controller
5151
run: make dev-deploy IMG=test/kustomize-controller:latest
5252
env:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this project are documented in this file.
44

5+
## 0.0.1-alpha.5 (2020-04-27)
6+
7+
This alpha release introduces an [intermediate state](https://github.com/fluxcd/kustomize-controller/pull/21)
8+
to the status ready condition to signal that a reconciliation is underway.
9+
This allows waiting for an on-demand sync to complete.
10+
511
## 0.0.1-alpha.4 (2020-04-24)
612

713
This alpha release introduces a new status field for recording the

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ manifests and `kustomization.yaml` file.
3939
Install source-controller with:
4040

4141
```bash
42-
kustomize build https://github.com/fluxcd/source-controller//config/default?ref=v0.0.1-alpha.2 \
42+
kustomize build https://github.com/fluxcd/source-controller//config/default?ref=v0.0.1-alpha.3 \
4343
kubectl apply -f-
4444
```
4545

4646
Install kustomize-controller with:
4747

4848
```bash
49-
kustomize build https://github.com/fluxcd/kustomize-controller//config/default?ref=v0.0.1-alpha.4 \
49+
kustomize build https://github.com/fluxcd/kustomize-controller//config/default?ref=v0.0.1-alpha.5 \
5050
kubectl apply -f-
5151
```
5252

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ resources:
55
images:
66
- name: fluxcd/kustomize-controller
77
newName: fluxcd/kustomize-controller
8-
newTag: v0.0.1-alpha.4
8+
newTag: v0.0.1-alpha.5

docs/internal/release.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Release
2+
3+
To release a new version the following steps should be followed:
4+
5+
1. Create a new branch from `master` i.e. `release-<next semver>`. This
6+
will function as your release preparation branch.
7+
1. Add an entry to the `CHANGELOG.md` for the new release and change the
8+
`newTag` value in ` config/manager/kustomization.yaml` to that of the
9+
semver release you are going to make. Commit and push your changes.
10+
1. Create a PR for your release branch and get it merged into `master`.
11+
1. Create a `<next semver>` tag for the merge commit in `master` and
12+
push it to remote.
13+
1. Confirm CI builds and releases the newly tagged version.

docs/spec/v1alpha1/kustomization.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,30 @@ const (
9797
// ApplyFailedReason represents the fact that the kustomization apply failed.
9898
ApplyFailedReason string = "ApplyFailed"
9999

100+
// ArtifactFailedReason represents the fact that the artifact download failed.
101+
ArtifactFailedReason string = "ArtifactFailed"
102+
100103
// BuildFailedReason represents the fact that the kustomize build command failed.
101104
BuildFailedReason string = "BuildFailed"
102105

106+
// DependencyNotReady represents the fact that the one of the dependencies is not ready.
107+
DependencyNotReadyReason string = "DependencyNotReady"
108+
109+
// HealthCheckFailedReason represents the fact that the one of the health check failed.
110+
HealthCheckFailedReason string = "HealthCheckFailed"
111+
112+
// InitializedReason represents the fact that a given resource has been initialized.
113+
InitializedReason string = "Initialized"
114+
115+
// ProgressingReason represents the fact that a kustomization reconciliation
116+
// is underway.
117+
ProgressingReason string = "Progressing"
118+
103119
// SuspendedReason represents the fact that the kustomization execution is suspended.
104120
SuspendedReason string = "Suspended"
105121

106122
// ValidationFailedReason represents the fact that the dry-run apply failed.
107123
ValidationFailedReason string = "ValidationFailed"
108-
109-
// ArtifactFailedReason represents the fact that the artifact acquisition failed.
110-
ArtifactFailedReason string = "ArtifactFailed"
111124
)
112125
```
113126

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/fluxcd/kustomize-controller
33
go 1.13
44

55
require (
6-
github.com/fluxcd/source-controller v0.0.1-alpha.1
6+
github.com/fluxcd/source-controller v0.0.1-alpha.3
77
github.com/go-logr/logr v0.1.0
88
github.com/onsi/ginkgo v1.11.0
99
github.com/onsi/gomega v1.8.1

go.sum

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
118118
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
119119
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
120120
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
121-
github.com/fluxcd/source-controller v0.0.1-alpha.1 h1:UgQ9xnTZdhJN2UMrOfxa6QUan/7ckScpInvy6C24mqQ=
122-
github.com/fluxcd/source-controller v0.0.1-alpha.1/go.mod h1:11wGvvFvaae1wW4ZyZfanCUfFj8qcowW2Z8hx//Q8To=
121+
github.com/fluxcd/source-controller v0.0.1-alpha.3 h1:K3fsQmF41VTTOI7xsSWV7QN3RoFoAxi++Ijis/Obn7M=
122+
github.com/fluxcd/source-controller v0.0.1-alpha.3/go.mod h1:fPCrtqQo4x+/lPaxZAHebRRBBI/yI7q1mpl2dPRwLzQ=
123123
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
124124
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
125125
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -628,6 +628,7 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
628628
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
629629
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
630630
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
631+
rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
631632
sigs.k8s.io/controller-runtime v0.5.0 h1:CbqIy5fbUX+4E9bpnBFd204YAzRYlM9SWW77BbrcDQo=
632633
sigs.k8s.io/controller-runtime v0.5.0/go.mod h1:REiJzC7Y00U+2YkMbT8wxgrsX5USpXKGhb2sCtAXiT8=
633634
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=

0 commit comments

Comments
 (0)