Skip to content

Commit

Permalink
Merge pull request #113 from fluxcd/crd-v1
Browse files Browse the repository at this point in the history
Drop support for Kubernetes <1.16
  • Loading branch information
stefanprodan authored Jul 20, 2020
2 parents dcec800 + 6d2ff6e commit 10bb50b
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 37 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ jobs:
with:
go-version: 1.14.x
- name: Setup Kubernetes
uses: engineerd/[email protected]
uses: engineerd/[email protected]
with:
image: kindest/node:v1.16.9
- name: Run test
run: make test
- name: Check if working tree is dirty
Expand Down
2 changes: 1 addition & 1 deletion cmd/tk/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func runCheckCmd(cmd *cobra.Command, args []string) error {
checkFailed = true
}

if !kubernetesCheck(">=1.14.0") {
if !kubernetesCheck(">=1.16.0") {
checkFailed = true
}

Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ go 1.14

require (
github.com/blang/semver v3.5.1+incompatible
github.com/fluxcd/helm-controller v0.0.1-alpha.2
github.com/fluxcd/kustomize-controller v0.0.4
github.com/fluxcd/helm-controller v0.0.1-beta.1
github.com/fluxcd/kustomize-controller v0.0.5
github.com/fluxcd/pkg v0.0.3
github.com/fluxcd/source-controller v0.0.5
github.com/golang/protobuf v1.4.2 // indirect
github.com/fluxcd/source-controller v0.0.6
github.com/manifoldco/promptui v0.7.0
github.com/spf13/cobra v1.0.0
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
Expand All @@ -19,7 +18,7 @@ require (
k8s.io/api v0.18.4
k8s.io/apimachinery v0.18.4
k8s.io/client-go v0.18.4
sigs.k8s.io/controller-runtime v0.6.0
sigs.k8s.io/controller-runtime v0.6.1
sigs.k8s.io/kustomize/api v0.5.1
sigs.k8s.io/yaml v1.2.0
)
Expand Down
58 changes: 36 additions & 22 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions manifests/bases/helm-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.1-alpha.2
- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.1-alpha.2
- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.1-beta.1
- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.1-beta.1
patchesJson6902:
- target:
group: apps
Expand Down
4 changes: 2 additions & 2 deletions manifests/bases/kustomize-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.4
- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.4
- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.5
- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.5
patchesJson6902:
- target:
group: apps
Expand Down
4 changes: 2 additions & 2 deletions manifests/bases/notification-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.4
- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.4
- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.5
- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.5
4 changes: 2 additions & 2 deletions manifests/bases/source-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- github.com/fluxcd/source-controller/config//crd?ref=v0.0.5
- github.com/fluxcd/source-controller/config//manager?ref=v0.0.5
- github.com/fluxcd/source-controller/config//crd?ref=v0.0.6
- github.com/fluxcd/source-controller/config//manager?ref=v0.0.6
patchesJson6902:
- target:
group: apps
Expand Down

0 comments on commit 10bb50b

Please sign in to comment.