Skip to content

Commit

Permalink
Release v5.0.0 (#1566)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] authored Sep 26, 2022
1 parent c053d00 commit 17cf091
Show file tree
Hide file tree
Showing 83 changed files with 227 additions and 224 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [5.0.0] - 2022-09-26

### Changed

- Enable kube-proxy replacement mode in Cilium app.
Expand Down Expand Up @@ -371,7 +373,8 @@ be edited by users.



[Unreleased]: https://github.com/giantswarm/cluster-operator/compare/v4.6.2...HEAD
[Unreleased]: https://github.com/giantswarm/cluster-operator/compare/v5.0.0...HEAD
[5.0.0]: https://github.com/giantswarm/cluster-operator/compare/v4.6.2...v5.0.0
[4.6.2]: https://github.com/giantswarm/cluster-operator/compare/v4.6.1...v4.6.2
[4.6.1]: https://github.com/giantswarm/cluster-operator/compare/v4.6.0...v4.6.1
[4.6.0]: https://github.com/giantswarm/cluster-operator/compare/v4.5.2...v4.6.0
Expand Down
4 changes: 2 additions & 2 deletions flag/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package flag
import (
"github.com/giantswarm/microkit/flag"

"github.com/giantswarm/cluster-operator/v4/flag/guest"
"github.com/giantswarm/cluster-operator/v4/flag/service"
"github.com/giantswarm/cluster-operator/v5/flag/guest"
"github.com/giantswarm/cluster-operator/v5/flag/service"
)

// Flag provides data structure for service command line flags.
Expand Down
12 changes: 6 additions & 6 deletions flag/guest/cluster/cluster.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package cluster

import (
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/calico"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/docker"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/etcd"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/provider"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/vault"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/calico"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/docker"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/etcd"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/provider"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/vault"
)

// Cluster is a data structure to hold cluster specific configuration flags.
Expand Down
2 changes: 1 addition & 1 deletion flag/guest/cluster/docker/docker.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package docker

import "github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/docker/daemon"
import "github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/docker/daemon"

// Docker is a data structure to hold guest cluster Docker specific
// configuration flags.
Expand Down
2 changes: 1 addition & 1 deletion flag/guest/cluster/kubernetes/hyperkube/hyperkube.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hyperkube

import "github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/hyperkube/docker"
import "github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/hyperkube/docker"

// Hyperkube is a data structure to hold guest cluster Kubernetes Hyperkube
// image specific configuration flags.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ingresscontroller

import "github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/ingresscontroller/docker"
import "github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/ingresscontroller/docker"

// IngressController is a data structure to hold guest cluster ingress
// controller specific configuration flags.
Expand Down
12 changes: 6 additions & 6 deletions flag/guest/cluster/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package kubernetes

import (
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/api"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/hyperkube"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/ingresscontroller"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/kubelet"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/networksetup"
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/ssh"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/api"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/hyperkube"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/ingresscontroller"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/kubelet"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/networksetup"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/ssh"
)

// Kubernetes is a data structure to hold guest cluster Kubernetes specific
Expand Down
2 changes: 1 addition & 1 deletion flag/guest/cluster/kubernetes/networksetup/networksetup.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package networksetup

import "github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/kubernetes/networksetup/docker"
import "github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/kubernetes/networksetup/docker"

// NetworkSetup is a data structure to hold guest cluster network setup
// configuration flags.
Expand Down
2 changes: 1 addition & 1 deletion flag/guest/cluster/vault/vault.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vault

import (
"github.com/giantswarm/cluster-operator/v4/flag/guest/cluster/vault/certificate"
"github.com/giantswarm/cluster-operator/v5/flag/guest/cluster/vault/certificate"
)

// Vault is a data structure to hold guest cluster vault related configuration.
Expand Down
2 changes: 1 addition & 1 deletion flag/guest/guest.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package guest

import "github.com/giantswarm/cluster-operator/v4/flag/guest/cluster"
import "github.com/giantswarm/cluster-operator/v5/flag/guest/cluster"

// Guest is a data structure to hold guest cluster specific configuration
// flags.
Expand Down
2 changes: 1 addition & 1 deletion flag/service/image/image.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package image

import "github.com/giantswarm/cluster-operator/v4/flag/service/image/registry"
import "github.com/giantswarm/cluster-operator/v5/flag/service/image/registry"

// Image is a data structure to hold container image specific configuration
// flags.
Expand Down
2 changes: 1 addition & 1 deletion flag/service/kubeconfig/kubeconfig.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package kubeconfig

import (
"github.com/giantswarm/cluster-operator/v4/flag/service/kubeconfig/resource"
"github.com/giantswarm/cluster-operator/v5/flag/service/kubeconfig/resource"
)

// KubeConfig is a data structure to hold kubeconfig specific configuration flags.
Expand Down
2 changes: 1 addition & 1 deletion flag/service/release/app/app.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app

import "github.com/giantswarm/cluster-operator/v4/flag/service/release/app/config"
import "github.com/giantswarm/cluster-operator/v5/flag/service/release/app/config"

type App struct {
Config config.Config
Expand Down
2 changes: 1 addition & 1 deletion flag/service/release/release.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package release

import "github.com/giantswarm/cluster-operator/v4/flag/service/release/app"
import "github.com/giantswarm/cluster-operator/v5/flag/service/release/app"

type Release struct {
App app.App
Expand Down
8 changes: 4 additions & 4 deletions flag/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package service
import (
"github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes"

"github.com/giantswarm/cluster-operator/v4/flag/service/image"
"github.com/giantswarm/cluster-operator/v4/flag/service/kubeconfig"
"github.com/giantswarm/cluster-operator/v4/flag/service/provider"
"github.com/giantswarm/cluster-operator/v4/flag/service/release"
"github.com/giantswarm/cluster-operator/v5/flag/service/image"
"github.com/giantswarm/cluster-operator/v5/flag/service/kubeconfig"
"github.com/giantswarm/cluster-operator/v5/flag/service/provider"
"github.com/giantswarm/cluster-operator/v5/flag/service/release"
)

// Service is an intermediate data structure for command line configuration flags.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/giantswarm/cluster-operator/v4
module github.com/giantswarm/cluster-operator/v5

go 1.18

Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/giantswarm/micrologger"
"github.com/spf13/viper"

"github.com/giantswarm/cluster-operator/v4/flag"
"github.com/giantswarm/cluster-operator/v4/pkg/project"
"github.com/giantswarm/cluster-operator/v4/server"
"github.com/giantswarm/cluster-operator/v4/service"
"github.com/giantswarm/cluster-operator/v5/flag"
"github.com/giantswarm/cluster-operator/v5/pkg/project"
"github.com/giantswarm/cluster-operator/v5/server"
"github.com/giantswarm/cluster-operator/v5/service"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var (
gitSHA = "n/a"
name = "cluster-operator"
source = "https://github.com/giantswarm/cluster-operator"
version = "4.6.3-dev"
version = "5.0.0"
)

func Description() string {
Expand Down
4 changes: 2 additions & 2 deletions server/endpoint/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"

"github.com/giantswarm/cluster-operator/v4/server/middleware"
"github.com/giantswarm/cluster-operator/v4/service"
"github.com/giantswarm/cluster-operator/v5/server/middleware"
"github.com/giantswarm/cluster-operator/v5/service"
)

// Config represents the configuration used to construct an endpoint.
Expand Down
2 changes: 1 addition & 1 deletion server/middleware/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package middleware
import (
"github.com/giantswarm/micrologger"

"github.com/giantswarm/cluster-operator/v4/service"
"github.com/giantswarm/cluster-operator/v5/service"
)

// Config represents the configuration used to construct middleware.
Expand Down
6 changes: 3 additions & 3 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/giantswarm/micrologger"
"github.com/spf13/viper"

"github.com/giantswarm/cluster-operator/v4/server/endpoint"
"github.com/giantswarm/cluster-operator/v4/server/middleware"
"github.com/giantswarm/cluster-operator/v4/service"
"github.com/giantswarm/cluster-operator/v5/server/endpoint"
"github.com/giantswarm/cluster-operator/v5/server/middleware"
"github.com/giantswarm/cluster-operator/v5/service"
)

// Config represents the configuration used to construct server object.
Expand Down
6 changes: 3 additions & 3 deletions service/collector/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"sigs.k8s.io/cluster-api/util/conditions"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v4/pkg/project"
"github.com/giantswarm/cluster-operator/v4/service/controller/key"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/project"
"github.com/giantswarm/cluster-operator/v5/service/controller/key"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions service/collector/cluster_transition.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v4/pkg/project"
"github.com/giantswarm/cluster-operator/v4/service/controller/key"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/project"
"github.com/giantswarm/cluster-operator/v5/service/controller/key"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion service/collector/cluster_transition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"

"github.com/giantswarm/cluster-operator/v4/service/internal/unittest"
"github.com/giantswarm/cluster-operator/v5/service/internal/unittest"
)

func TestCollectClusterTransition(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions service/collector/node_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v4/pkg/project"
"github.com/giantswarm/cluster-operator/v4/service/controller/key"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/project"
"github.com/giantswarm/cluster-operator/v5/service/controller/key"
)

var (
Expand Down
52 changes: 26 additions & 26 deletions service/controller/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ import (
apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v4/pkg/project"
"github.com/giantswarm/cluster-operator/v4/service/controller/key"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/app"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/appfinalizer"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/appversionlabel"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/certconfig"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/clusterconfigmap"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/clusterid"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/clusterstatus"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/cpnamespace"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/deletecrs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/deleteinfrarefs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/keepforcrs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/keepforinfrarefs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/kubeconfig"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/statuscondition"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/updateg8scontrolplanes"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/updateinfrarefs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/updatemachinedeployments"
"github.com/giantswarm/cluster-operator/v4/service/internal/basedomain"
"github.com/giantswarm/cluster-operator/v4/service/internal/hamaster"
"github.com/giantswarm/cluster-operator/v4/service/internal/podcidr"
"github.com/giantswarm/cluster-operator/v4/service/internal/recorder"
"github.com/giantswarm/cluster-operator/v4/service/internal/releaseversion"
"github.com/giantswarm/cluster-operator/v4/service/internal/tenantclient"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/project"
"github.com/giantswarm/cluster-operator/v5/service/controller/key"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/app"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/appfinalizer"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/appversionlabel"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/certconfig"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/clusterconfigmap"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/clusterid"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/clusterstatus"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/cpnamespace"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/deletecrs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/deleteinfrarefs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/keepforcrs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/keepforinfrarefs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/kubeconfig"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/statuscondition"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/updateg8scontrolplanes"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/updateinfrarefs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/updatemachinedeployments"
"github.com/giantswarm/cluster-operator/v5/service/internal/basedomain"
"github.com/giantswarm/cluster-operator/v5/service/internal/hamaster"
"github.com/giantswarm/cluster-operator/v5/service/internal/podcidr"
"github.com/giantswarm/cluster-operator/v5/service/internal/recorder"
"github.com/giantswarm/cluster-operator/v5/service/internal/releaseversion"
"github.com/giantswarm/cluster-operator/v5/service/internal/tenantclient"
)

// ClusterConfig contains necessary dependencies and settings for CAPI's Cluster
Expand Down
22 changes: 11 additions & 11 deletions service/controller/control_plane.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import (
"k8s.io/apimachinery/pkg/labels"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v4/pkg/project"
"github.com/giantswarm/cluster-operator/v4/service/controller/key"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/controlplanestatus"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/deleteinfrarefs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/keepforinfrarefs"
"github.com/giantswarm/cluster-operator/v4/service/controller/resource/updateinfrarefs"
"github.com/giantswarm/cluster-operator/v4/service/internal/basedomain"
"github.com/giantswarm/cluster-operator/v4/service/internal/nodecount"
"github.com/giantswarm/cluster-operator/v4/service/internal/recorder"
"github.com/giantswarm/cluster-operator/v4/service/internal/releaseversion"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/project"
"github.com/giantswarm/cluster-operator/v5/service/controller/key"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/controlplanestatus"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/deleteinfrarefs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/keepforinfrarefs"
"github.com/giantswarm/cluster-operator/v5/service/controller/resource/updateinfrarefs"
"github.com/giantswarm/cluster-operator/v5/service/internal/basedomain"
"github.com/giantswarm/cluster-operator/v5/service/internal/nodecount"
"github.com/giantswarm/cluster-operator/v5/service/internal/recorder"
"github.com/giantswarm/cluster-operator/v5/service/internal/releaseversion"
)

// ControlPlaneConfig contains necessary dependencies and settings for the
Expand Down
2 changes: 1 addition & 1 deletion service/controller/key/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package key
import (
"fmt"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion service/controller/key/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package key
import (
"testing"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
)

// A mock object that implements LabelsGetter interface
Expand Down
2 changes: 1 addition & 1 deletion service/controller/key/key.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/giantswarm/apiextensions/v6/pkg/apis/core/v1alpha1"
"github.com/giantswarm/microerror"

"github.com/giantswarm/cluster-operator/v4/pkg/label"
"github.com/giantswarm/cluster-operator/v5/pkg/label"
)

const (
Expand Down
Loading

0 comments on commit 17cf091

Please sign in to comment.