Build with Go 1.19

- Update Go to 1.19 in CI - Use Go 1.19 in base image - Update controller-gen v0.8.0 and regenerate manifests Signed-off-by: Stefan Prodan <[email protected]>
fluxcd · Sep 28, 2022 · 90b31de · 90b31de
1 parent 2833caa
commit 90b31de
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 93 deletions.
diff --git a/.github/workflows/cifuzz.yaml b/.github/workflows/cifuzz.yaml
@@ -20,7 +20,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - id: go-env
  run: |
  echo "::set-output name=go-mod-cache::$(go env GOMODCACHE)"

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -23,7 +23,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - name: Restore Go cache
  uses: actions/cache@v3
  with:
@@ -60,7 +60,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - name: Enable integration tests
  # Only run integration tests for main branch
  if: github.ref == 'refs/heads/main'

diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
@@ -34,7 +34,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.18
+ go-version: 1.19.x
  - name: Initialize CodeQL
  uses: github/codeql-action/init@v2
  with:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -24,7 +24,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - name: Restore Go cache
  uses: actions/cache@v3
  with:
@@ -48,7 +48,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - name: Run tests
  env:
  TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }}
@@ -77,7 +77,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - name: Restore Go cache
  uses: actions/cache@v3
  with:

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -24,7 +24,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v3
  with:
- go-version: 1.18.x
+ go-version: 1.19.x
  - name: Restore Go cache
  uses: actions/cache@v3
  with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_VARIANT=alpine
-ARG GO_VERSION=1.18
+ARG GO_VERSION=1.19
 ARG XX_VERSION=1.1.2
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-only

diff --git a/Makefile b/Makefile
@@ -125,8 +125,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
  $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta2 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/source.md
 
 tidy: ## Run go mod tidy
- cd api; rm -f go.sum; go mod tidy -compat=1.18
- rm -f go.sum; go mod tidy -compat=1.18
+ cd api; rm -f go.sum; go mod tidy -compat=1.19
+ rm -f go.sum; go mod tidy -compat=1.19
 
 fmt: ## Run go fmt against code
  go fmt ./...
@@ -155,7 +155,7 @@ docker-push: ## Push Docker image
 CONTROLLER_GEN = $(GOBIN)/controller-gen
 .PHONY: controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
- $(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
+ $(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
 
 # Find or download gen-crd-api-reference-docs
 GEN_CRD_API_REFERENCE_DOCS = $(GOBIN)/gen-crd-api-reference-docs

diff --git a/config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml b/config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  creationTimestamp: null
  name: buckets.source.toolkit.fluxcd.io
 spec:
@@ -167,14 +166,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition
@@ -422,14 +419,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition

diff --git a/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml b/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  creationTimestamp: null
  name: gitrepositories.source.toolkit.fluxcd.io
 spec:
@@ -236,14 +235,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition
@@ -597,14 +594,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition
@@ -664,8 +659,8 @@ spec:
  type: array
  contentConfigChecksum:
  description: 'ContentConfigChecksum is a checksum of all the configurations
- related to the content of the source artifact:  - .spec.ignore  -
- .spec.recurseSubmodules  - .spec.included and the checksum of the
+ related to the content of the source artifact: - .spec.ignore -
+ .spec.recurseSubmodules - .spec.included and the checksum of the
  included artifacts observed in .status.observedGeneration version
  of the object. This can be used to determine if the content of the
  included repository has changed. It has the format of `<algo>:<checksum>`,

diff --git a/config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml b/config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  creationTimestamp: null
  name: helmcharts.source.toolkit.fluxcd.io
 spec:
@@ -192,14 +191,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition
@@ -469,14 +466,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition

diff --git a/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml b/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  creationTimestamp: null
  name: helmrepositories.source.toolkit.fluxcd.io
 spec:
@@ -155,14 +154,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition
@@ -414,14 +411,12 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
  properties:
  lastTransitionTime:
  description: lastTransitionTime is the last time the condition