Merge remote-tracking branch 'origin/main' into k0s-1-28

emosbaugh · emosbaugh · commit f9d522b95d44 · 2024-08-30T11:47:22.000-07:00
diff --git a/docs/resources.md b/docs/resources.md
@@ -11,7 +11,7 @@ This ingestion happens at k0s daemon startup on controller nodes.
 
 It can be dynamically updated, and the k0s config reconciliation process will apply any changes to the cluster except from `spec.api` and `spec.storage`.
 
-The [embedded cluster operator](https://github.com/replicatedhq/embedded-cluster-operator/) reconciles helm chart updates against the `ClusterConfig` object to initiate helm chart upgrades via the k0s helm reconciler.
+The [embedded cluster operator](https://github.com/replicatedhq/embedded-cluster/operator/) reconciles helm chart updates against the `ClusterConfig` object to initiate helm chart upgrades via the k0s helm reconciler.
 
 ## Chart
 - **Owner**: k0s
@@ -39,4 +39,4 @@ The `Installation` object is used by the Embedded Cluster Operator to both initi
 
 The `Installation` object can contain errors surfaced from the `Plan` and `Chart` resources.
 
-Possible Installation statuses can be found here: https://github.com/replicatedhq/embedded-cluster-operator/blob/e4fbb42919ad3b58cdc563dca77471cf76099393/api/v1beta1/installation_types.go#L24
+Possible Installation statuses can be found here: https://github.com/replicatedhq/embedded-cluster-kinds/blob/f54d45f99095ac6beaac61a3c8b735b9f7473329/apis/v1beta1/installation_types.go#L29-L42
diff --git a/go.mod b/go.mod
@@ -29,7 +29,6 @@ require (
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	github.com/replicatedhq/embedded-cluster-kinds v1.4.7
-	github.com/replicatedhq/embedded-cluster-operator v0.42.1
 	github.com/replicatedhq/embedded-cluster-utils v1.0.0
 	github.com/replicatedhq/kotskinds v0.0.0-20240621115447-55148ce032e4
 	github.com/replicatedhq/troubleshoot v0.100.0
diff --git a/go.sum b/go.sum
@@ -510,8 +510,6 @@ github.com/redis/go-redis/v9 v9.5.2 h1:L0L3fcSNReTRGyZ6AqAEN0K56wYeYAwapBIhkvh0f
 github.com/redis/go-redis/v9 v9.5.2/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/replicatedhq/embedded-cluster-kinds v1.4.7 h1:CR55z8Q2ek90BwwwOEz+P3qFIgc84G7wp/FNs+ctfsw=
 github.com/replicatedhq/embedded-cluster-kinds v1.4.7/go.mod h1:AwopUvvGcaWO4mn9DkbPj5RnLuOy756CNLrcaAlmjMo=
-github.com/replicatedhq/embedded-cluster-operator v0.42.1 h1:x0R41d3FwMWjLsbWGL5PQa92++kYD7XmB43/VRtzVjc=
-github.com/replicatedhq/embedded-cluster-operator v0.42.1/go.mod h1:f6B+AFztqFXk6lTmPTfXFcHSEfHNnhd9SAa7NBMhNRI=
 github.com/replicatedhq/embedded-cluster-utils v1.0.0 h1:Axdni1nYfl5zeOP9g5U79yvN8cRdClyU6hz0wV1Hmdc=
 github.com/replicatedhq/embedded-cluster-utils v1.0.0/go.mod h1:4JmMC2CwMCLxq05GEW3XSPPVotqyamAF/omrbB3pH+c=
 github.com/replicatedhq/kotskinds v0.0.0-20240621115447-55148ce032e4 h1:nsNSod6wpFpaMUq1IqnU4y2XWQd2FEKtdr02UB2udkk=
diff --git a/operator/PROJECT b/operator/PROJECT
@@ -9,7 +9,7 @@ plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: embedded-cluster-operator
-repo: github.com/replicatedhq/embedded-cluster-operator
+repo: github.com/replicatedhq/embedded-cluster/operator
 resources:
 - api:
     crdVersion: v1
diff --git a/operator/controllers/installation_controller.go b/operator/controllers/installation_controller.go
@@ -44,15 +44,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/autopilot"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/charts"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/metadata"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/metrics"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/openebs"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/registry"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/release"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/util"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/autopilot"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/charts"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/metadata"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/metrics"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/openebs"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/registry"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/release"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/util"
 )
 
 // InstallationNameAnnotation is the annotation we keep in the autopilot plan so we can
diff --git a/operator/controllers/installation_controller_test.go b/operator/controllers/installation_controller_test.go
@@ -8,7 +8,7 @@ import (
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	ectypes "github.com/replicatedhq/embedded-cluster-kinds/types"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/release"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/release"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
diff --git a/operator/controllers/k0s.go b/operator/controllers/k0s.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/k0sproject/version"
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/release"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/release"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
diff --git a/operator/main.go b/operator/main.go
@@ -19,7 +19,7 @@ package main
 import (
 	"os"
 
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/cli"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/cli"
 )
 
 func main() {
diff --git a/operator/pkg/artifacts/upgrade.go b/operator/pkg/artifacts/upgrade.go
@@ -9,9 +9,9 @@ import (
 
 	autopilotv1beta2 "github.com/k0sproject/k0s/pkg/apis/autopilot/v1beta2"
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/release"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/util"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/release"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/util"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/operator/pkg/artifacts/upgrade_test.go b/operator/pkg/artifacts/upgrade_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/go-logr/logr/testr"
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	batchv1 "k8s.io/api/batch/v1"
diff --git a/operator/pkg/charts/charts.go b/operator/pkg/charts/charts.go
@@ -14,9 +14,9 @@ import (
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	ectypes "github.com/replicatedhq/embedded-cluster-kinds/types"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/registry"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/util"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/registry"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/util"
 )
 
 const (
diff --git a/operator/pkg/charts/charts_test.go b/operator/pkg/charts/charts_test.go
@@ -7,7 +7,7 @@ import (
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	ectypes "github.com/replicatedhq/embedded-cluster-kinds/types"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/registry"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/registry"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/pkg/cli/migrate.go b/operator/pkg/cli/migrate.go
@@ -3,7 +3,7 @@ package cli
 import (
 	"fmt"
 
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/migrations"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/migrations"
 	"github.com/spf13/cobra"
 )
 
diff --git a/operator/pkg/cli/root.go b/operator/pkg/cli/root.go
@@ -13,8 +13,8 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/replicatedhq/embedded-cluster-operator/controllers"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/controllers"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
 )
 
 var (
diff --git a/operator/pkg/cli/upgrade.go b/operator/pkg/cli/upgrade.go
@@ -7,8 +7,8 @@ import (
 	"os"
 
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/upgrade"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/upgrade"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
diff --git a/operator/pkg/metadata/airgap.go b/operator/pkg/metadata/airgap.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/artifacts"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/release"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/artifacts"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/release"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	ctrl "sigs.k8s.io/controller-runtime"
diff --git a/operator/pkg/migrations/registry.go b/operator/pkg/migrations/registry.go
@@ -11,8 +11,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/registry"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/registry"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/pkg/openebs/openebs_test.go b/operator/pkg/openebs/openebs_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/testutils"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/testutils"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/pkg/registry/migrate.go b/operator/pkg/registry/migrate.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/operator/pkg/registry/registry.go b/operator/pkg/registry/registry.go
@@ -3,7 +3,7 @@ package registry
 import (
 	"fmt"
 
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/util"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/util"
 )
 
 const (
diff --git a/operator/pkg/registry/seaweedfs.go b/operator/pkg/registry/seaweedfs.go
@@ -2,7 +2,8 @@ package registry
 
 import (
 	"fmt"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/util"
+
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/util"
 )
 
 const (
diff --git a/operator/pkg/upgrade/upgrade.go b/operator/pkg/upgrade/upgrade.go
@@ -12,12 +12,12 @@ import (
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/artifacts"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/autopilot"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/charts"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/k8sutil"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/metadata"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/release"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/artifacts"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/autopilot"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/charts"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/metadata"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/release"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/schemagen/main.go b/operator/schemagen/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/replicatedhq/embedded-cluster-operator/schemagen/cli"
+	"github.com/replicatedhq/embedded-cluster/operator/schemagen/cli"
 )
 
 func main() {
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/k0sproject/dig"
 	k0sconfig "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/charts"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/charts"
 	"gopkg.in/yaml.v2"
 	k8syaml "sigs.k8s.io/yaml"
 
diff --git a/pkg/highavailability/seaweed.go b/pkg/highavailability/seaweed.go
@@ -8,7 +8,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
 
 	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster-operator/pkg/util"
+	"github.com/replicatedhq/embedded-cluster/operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/k0sproject/version"`
`9`	`9`	`clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"`
`10`		`- "github.com/replicatedhq/embedded-cluster-operator/pkg/release"`
	`10`	`+ "github.com/replicatedhq/embedded-cluster/operator/pkg/release"`
`11`	`11`	`ctrl "sigs.k8s.io/controller-runtime"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package main`
`19`	`19`	`import (`
`20`	`20`	`"os"`
`21`	`21`
`22`		`- "github.com/replicatedhq/embedded-cluster-operator/pkg/cli"`
	`22`	`+ "github.com/replicatedhq/embedded-cluster/operator/pkg/cli"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func main() {`