Skip to content

Commit

Permalink
Merge pull request #20 from smcavallo/upjet_1.4.0
Browse files Browse the repository at this point in the history 
Upgrade to upjet 1.4.0
  • Loading branch information
@smcavallo
smcavallo authored Jun 3, 2024
2 parents 33b7572 + 06c8272 commit 8f154cc
Show file tree
Hide file tree
Showing 9 changed files with 107 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ NPROCS ?= 1
# to half the number of CPU cores.
GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))

GO_REQUIRED_VERSION ?= 1.21
GO_REQUIRED_VERSION ?= 1.22
GOLANGCILINT_VERSION ?= 1.55.2
GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider $(GO_PROJECT)/cmd/generator
GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
Expand Down
2 changes: 1 addition & 1 deletion apis/alert/v1alpha1/zz_destination_terraformed.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 16 additions & 4 deletions apis/alert/v1alpha1/zz_destination_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions apis/alert/v1alpha1/zz_generated.conversion_hubs.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions apis/alert/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/schema.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
dario.cat/mergo v1.0.0
github.com/crossplane/crossplane-runtime v1.16.0
github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79
github.com/crossplane/upjet v1.3.0
github.com/crossplane/upjet v1.4.0
github.com/pkg/errors v0.9.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
k8s.io/apimachinery v0.29.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ github.com/crossplane/crossplane-runtime v1.16.0 h1:lz+l0wEB3qowdTmN7t0PZkfuNSvf
github.com/crossplane/crossplane-runtime v1.16.0/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc=
github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y=
github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0=
github.com/crossplane/upjet v1.3.0 h1:qRgcfqLz4M2v7enUku3xEriY5poc5XVbRl98nbvvu+E=
github.com/crossplane/upjet v1.3.0/go.mod h1:3pDVtCgyBc5f2Zx4K5HEPxxhjndmOc5CHCJNpIivK/g=
github.com/crossplane/upjet v1.4.0 h1:twKCU8omU7VAA7E5fpbQkqDHjVnoTb8EXqmB805Q37o=
github.com/crossplane/upjet v1.4.0/go.mod h1:3pDVtCgyBc5f2Zx4K5HEPxxhjndmOc5CHCJNpIivK/g=
github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw=
github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
86 changes: 78 additions & 8 deletions package/crds/alert.newrelic.upbound.io_destinations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ spec:
user:
description: The username of the basic auth.
type: string
required:
- passwordSecretRef
type: object
type: array
authCustomHeader:
Expand Down Expand Up @@ -138,8 +136,6 @@ spec:
- name
- namespace
type: object
required:
- valueSecretRef
type: object
type: array
authToken:
Expand Down Expand Up @@ -168,8 +164,6 @@ spec:
- name
- namespace
type: object
required:
- tokenSecretRef
type: object
type: array
name:
Expand Down Expand Up @@ -232,8 +226,6 @@ spec:
- name
- namespace
type: object
required:
- secureSuffixSecretRef
type: object
type: array
type:
Expand Down Expand Up @@ -269,9 +261,29 @@ spec:
Basic username and password authentication credentials.
items:
properties:
passwordSecretRef:
description: Specifies an authentication password for use
with a destination.
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
user:
description: The username of the basic auth.
type: string
required:
- passwordSecretRef
type: object
type: array
authCustomHeader:
Expand All @@ -283,6 +295,25 @@ spec:
key:
description: The key of the header.
type: string
valueSecretRef:
description: The secret value of the header.
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
required:
- valueSecretRef
type: object
type: array
authToken:
Expand All @@ -294,6 +325,25 @@ spec:
prefix:
description: The prefix of the token auth.
type: string
tokenSecretRef:
description: Specifies the token for integrating.
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
required:
- tokenSecretRef
type: object
type: array
name:
Expand Down Expand Up @@ -338,6 +388,26 @@ spec:
prefix:
description: The prefix of the URL.
type: string
secureSuffixSecretRef:
description: The suffix of the URL, which contains sensitive
data.
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
required:
- secureSuffixSecretRef
type: object
type: array
type:
Expand Down

0 comments on commit 8f154cc

Please sign in to comment.