Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/publish-provider-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ on:
platform:
type: choice
description: "Platform string to use while building and publishing the packages (e.g. linux_amd64 linux_arm64)"
default: 'linux_amd64'
options:
default: linux_amd64 linux_arm64
options:
- linux_amd64 linux_arm64
- linux_amd64
- linux_arm64
required: true
go-version:
description: 'Go version to use if building needs to be done'
default: '1.24'
default: '1.25'
required: false
size:
description: "Number of smaller provider packages to build and push with each build job"
Expand Down Expand Up @@ -117,12 +118,12 @@ jobs:
run: |
go install golang.org/x/tools/cmd/goimports@latest
make generate
make SUBPACKAGES="${{ inputs.subpackages }}" PLATFORMS=${{ inputs.platform }} build
make SUBPACKAGES="${{ inputs.subpackages }}" PLATFORMS="${{ inputs.platform }}" build
env:
# We're using docker buildx, which doesn't actually load the images it
# builds by default. Specifying --load does so.
BUILD_ARGS: "--load"

- name: Publish Artifacts
run: |
make SUBPACKAGES_FOR_BATCH="${{ inputs.subpackages }}" XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" VERSION=${{ inputs.version }} BATCH_PLATFORMS=${{ inputs.platform }} publish-subpackages
make SUBPACKAGES_FOR_BATCH="${{ inputs.subpackages }}" XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" VERSION=${{ inputs.version }} BATCH_PLATFORMS="$(echo ${{ inputs.platform }} | tr ' ' ',')" publish-subpackages
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ NPROCS ?= 1
# to half the number of CPU cores.
GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))

GO_REQUIRED_VERSION ?= 1.24
GO_REQUIRED_VERSION ?= 1.25
GOLANGCILINT_VERSION ?= 1.50.0
GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider $(GO_PROJECT)/cmd/generator
GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/oracle/provider-oci

go 1.24.0

toolchain go1.24.5
go 1.25.0

require (
dario.cat/mergo v1.0.2
Expand Down
8 changes: 4 additions & 4 deletions package/crds/dns.oci.upbound.io_zones.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ spec:
publicly resolvable and not part of a private view.
type: string
viewIdRef:
description: Reference to a View to populate viewId.
description: Reference to a View in dns to populate viewId.
properties:
name:
description: Name of the referenced object.
Expand Down Expand Up @@ -264,7 +264,7 @@ spec:
- name
type: object
viewIdSelector:
description: Selector for a View to populate viewId.
description: Selector for a View in dns to populate viewId.
properties:
matchControllerRef:
description: |-
Expand Down Expand Up @@ -478,7 +478,7 @@ spec:
publicly resolvable and not part of a private view.
type: string
viewIdRef:
description: Reference to a View to populate viewId.
description: Reference to a View in dns to populate viewId.
properties:
name:
description: Name of the referenced object.
Expand Down Expand Up @@ -512,7 +512,7 @@ spec:
- name
type: object
viewIdSelector:
description: Selector for a View to populate viewId.
description: Selector for a View in dns to populate viewId.
properties:
matchControllerRef:
description: |-
Expand Down