Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build submodule and go to v1.20 #8

Merged
merged 3 commits into from
Oct 6, 2023
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

env:
# Common versions
GO_VERSION: '1.19'
GOLANGCI_VERSION: 'v1.52.2'
GO_VERSION: '1.20'
GOLANGCI_VERSION: 'v1.54.0'
DOCKER_BUILDX_VERSION: 'v0.9.1'

# Common users. We can't run a step 'if secrets.XXX != ""' but we can run a
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ linters-settings:
goimports:
# put imports beginning with prefix after 3rd-party packages;
# it's a comma-separated list of prefixes
local-prefixes: github.com/crossplane/provider-template
local-prefixes: github.com/swisscom/provider-cortex

gocyclo:
# minimal code complexity to report, 30 by default (but we recommend 10-20)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ====================================================================================
# Setup Project
PROJECT_NAME := provider-cortex
PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME)
PROJECT_REPO := github.com/swisscom/$(PROJECT_NAME)

PLATFORMS ?= linux_amd64 linux_arm64
-include build/makelib/common.mk
Expand Down
18 changes: 9 additions & 9 deletions PROVIDER_CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Generally projects are named `provider-<name>`, with `name` being the API being
managed. Example project names are `provider-aws`, `provider-kubernetes`,
and `provider-github`.

The [provider-cortex](https://github.com/crossplane/provider-cortex) repository can be
The [provider-cortex](https://github.com/swisscom/provider-cortex) repository can be
used as a starting point for new providers. For [terrajet](https://github.com/crossplane/terrajet)-based providers, the
[provider-jet-cortex](https://github.com/crossplane-contrib/provider-jet-cortex) is
available.
Expand All @@ -43,17 +43,17 @@ Most Crossplane providers include the following files:
[provider-gcp/README.md](https://github.com/crossplane/provider-gcp/blob/master/README.md)
as an example)
- [ ] Code is licensed under the [Apache 2.0
License](https://github.com/crossplane/provider-cortex/blob/main/LICENSE)
License](https://github.com/swisscom/provider-cortex/blob/main/LICENSE)
- [ ] Include a “Developer Certificate of Origin”. Example:
[DCO](https://github.com/upbound/build/blob/master/DCO)
- [ ] Include the CNCF [Code of
Conduct](https://github.com/crossplane/crossplane/blob/master/CODE_OF_CONDUCT.md)
- [ ] Update
[OWNERS.md](https://github.com/crossplane/provider-cortex/blob/main/OWNERS.md)
[OWNERS.md](https://github.com/swisscom/provider-cortex/blob/main/OWNERS.md)
with contacts for project Owners
- [ ] Ensure `hack/boilerplate.go.txt` (used in Code generation) includes
Crossplane Authors, Apache license and any other Copyright statements:
[https://github.com/crossplane/provider-cortex/blob/main/hack/boilerplate.go.txt](https://github.com/crossplane/provider-cortex/blob/main/hack/boilerplate.go.txt)
[https://github.com/swisscom/provider-cortex/blob/main/hack/boilerplate.go.txt](https://github.com/swisscom/provider-cortex/blob/main/hack/boilerplate.go.txt)
- [ ] Include Documentation on how to:
- [ ] Install Provider
- [ ] Contribute to Development
Expand All @@ -68,7 +68,7 @@ There are a number of build tools and processes that are common across the
Crossplane ecosystem. Using these ensures a consistent development environment
across projects.

The [provider-cortex](https://github.com/crossplane/provider-cortex)
The [provider-cortex](https://github.com/swisscom/provider-cortex)
repository contains most of these settings.

- [ ] Use the [Upbound build](https://github.com/upbound/build) submodule. (see
Expand All @@ -81,7 +81,7 @@ repository contains most of these settings.
- [ ] Create a [Crossplane
Package](https://crossplane.io/docs/master/concepts/packages.html)
configuration (see
[package/crossplane.yaml)](https://github.com/crossplane/provider-cortex/blob/main/package/crossplane.yaml)
[package/crossplane.yaml)](https://github.com/swisscom/provider-cortex/blob/main/package/crossplane.yaml)

## Deployment of Artifacts

Expand All @@ -96,7 +96,7 @@ the publish and promotion workflows.
In general, providers should:

- [ ] Utilize GitHub workflows from
<https://github.com/crossplane/provider-cortex/tree/main/.github/workflows>
<https://github.com/swisscom/provider-cortex/tree/main/.github/workflows>
- [ ] Create OCI image repos to push Package and Controller images.
- [ ] Automatically push Provider images and packages via CI
- [ ] Add GitHub Secrets to push to Docker repository. (To be performed by
Expand All @@ -113,6 +113,6 @@ to grant your project access to the GitHub org scoped secrets.
- [ ] Follow recommendations at
[https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#repository-governance](https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#repository-governance)
- [ ] Enable Issues on your project and configure Issue cortexs (examples at:
[.github/ISSUE_TEMPLATE](https://github.com/crossplane/provider-cortex/tree/master/.github/ISSUE_TEMPLATE))
[.github/ISSUE_TEMPLATE](https://github.com/swisscom/provider-cortex/tree/master/.github/ISSUE_TEMPLATE))
- [ ] Create Pull Request cortexs: (example:
[PULL_REQUEST_TEMPLATE.md](https://github.com/crossplane/provider-cortex/blob/master/.github/PULL_REQUEST_TEMPLATE.md))
[PULL_REQUEST_TEMPLATE.md](https://github.com/swisscom/provider-cortex/blob/master/.github/PULL_REQUEST_TEMPLATE.md))
6 changes: 3 additions & 3 deletions apis/cortex.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ package apis
import (
"k8s.io/apimachinery/pkg/runtime"

alertsv1alpha1 "github.com/crossplane/provider-cortex/apis/alerts/v1alpha1"
rulesv1alpha1 "github.com/crossplane/provider-cortex/apis/rules/v1alpha1"
cortexv1alpha1 "github.com/crossplane/provider-cortex/apis/v1alpha1"
alertsv1alpha1 "github.com/swisscom/provider-cortex/apis/alerts/v1alpha1"
rulesv1alpha1 "github.com/swisscom/provider-cortex/apis/rules/v1alpha1"
cortexv1alpha1 "github.com/swisscom/provider-cortex/apis/v1alpha1"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion build
8 changes: 4 additions & 4 deletions cmd/provider/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/ratelimiter"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/crossplane/provider-cortex/apis"
"github.com/crossplane/provider-cortex/apis/v1alpha1"
cortex "github.com/crossplane/provider-cortex/internal/controller"
"github.com/crossplane/provider-cortex/internal/features"
"github.com/swisscom/provider-cortex/apis"
"github.com/swisscom/provider-cortex/apis/v1alpha1"
cortex "github.com/swisscom/provider-cortex/internal/controller"
"github.com/swisscom/provider-cortex/internal/features"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/crossplane/provider-cortex
module github.com/swisscom/provider-cortex

go 1.19
go 1.20

require (
github.com/crossplane/crossplane-runtime v0.19.2
Expand Down
2 changes: 1 addition & 1 deletion internal/clients/cortex.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/crossplane/provider-cortex/apis/v1alpha1"
"github.com/swisscom/provider-cortex/apis/v1alpha1"
)

type Config struct {
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/alertmanager/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/crossplane/provider-cortex/apis/alerts/v1alpha1"
apisv1alpha1 "github.com/crossplane/provider-cortex/apis/v1alpha1"
xpClient "github.com/crossplane/provider-cortex/internal/clients"
"github.com/crossplane/provider-cortex/internal/clients/alertmanager"
"github.com/crossplane/provider-cortex/internal/features"
"github.com/swisscom/provider-cortex/apis/alerts/v1alpha1"
apisv1alpha1 "github.com/swisscom/provider-cortex/apis/v1alpha1"
xpClient "github.com/swisscom/provider-cortex/internal/clients"
"github.com/swisscom/provider-cortex/internal/clients/alertmanager"
"github.com/swisscom/provider-cortex/internal/features"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/alertmanager/configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"
"github.com/crossplane/crossplane-runtime/pkg/test"
"github.com/crossplane/provider-cortex/internal/clients/alertmanager"
"github.com/google/go-cmp/cmp"

"github.com/swisscom/provider-cortex/internal/clients/alertmanager"
)

// Unlike many Kubernetes projects Crossplane does not use third party testing
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/crossplane/provider-cortex/apis/v1alpha1"
"github.com/swisscom/provider-cortex/apis/v1alpha1"
)

// Setup adds a controller that reconciles ProviderConfigs by accounting for
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/cortex.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/controller"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/crossplane/provider-cortex/internal/controller/alertmanager"
"github.com/crossplane/provider-cortex/internal/controller/config"
"github.com/crossplane/provider-cortex/internal/controller/rulegroup"
"github.com/swisscom/provider-cortex/internal/controller/alertmanager"
"github.com/swisscom/provider-cortex/internal/controller/config"
"github.com/swisscom/provider-cortex/internal/controller/rulegroup"
)

// Setup creates all cortex controllers with the supplied logger and adds them to
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/rulegroup/rulegroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/crossplane/provider-cortex/apis/rules/v1alpha1"
apisv1alpha1 "github.com/crossplane/provider-cortex/apis/v1alpha1"
xpClient "github.com/crossplane/provider-cortex/internal/clients"
"github.com/crossplane/provider-cortex/internal/clients/rulegroups"
"github.com/crossplane/provider-cortex/internal/features"
"github.com/swisscom/provider-cortex/apis/rules/v1alpha1"
apisv1alpha1 "github.com/swisscom/provider-cortex/apis/v1alpha1"
xpClient "github.com/swisscom/provider-cortex/internal/clients"
"github.com/swisscom/provider-cortex/internal/clients/rulegroups"
"github.com/swisscom/provider-cortex/internal/features"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/rulegroup/rulegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"
"github.com/crossplane/crossplane-runtime/pkg/test"
"github.com/crossplane/provider-cortex/internal/clients/rulegroups"
"github.com/google/go-cmp/cmp"

"github.com/swisscom/provider-cortex/internal/clients/rulegroups"
)

// Unlike many Kubernetes projects Crossplane does not use third party testing
Expand Down
2 changes: 1 addition & 1 deletion package/crossplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: provider-cortex
annotations:
meta.crossplane.io/maintainer: Crossplane Maintainers <[email protected]>
meta.crossplane.io/source: github.com/crossplane/provider-cortex
meta.crossplane.io/source: github.com/swisscom/provider-cortex
meta.crossplane.io/license: Apache-2.0
meta.crossplane.io/description: |
A cortex that can be used to create Crossplane providers.
Loading