Merge branch 'main' into remove-redundant-space

.github/workflows/conformance.yaml

@@ -107,7 +107,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: Create cluster
         id: create-cluster
-        uses: replicatedhq/compatibility-actions/create-cluster@77121785951d05387334b773644c356885191f14 # v1.16.2
+        uses: replicatedhq/replicated-actions/create-cluster@77121785951d05387334b773644c356885191f14 # v1.16.2
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           kubernetes-distribution: "k3s"
@@ -200,7 +200,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: Create cluster
         id: create-cluster
-        uses: replicatedhq/compatibility-actions/create-cluster@77121785951d05387334b773644c356885191f14 # v1.16.2
+        uses: replicatedhq/replicated-actions/create-cluster@77121785951d05387334b773644c356885191f14 # v1.16.2
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           kubernetes-distribution: "openshift"

docs/release/release-notes-template.md

@@ -43,6 +43,9 @@ The following template can be used for the GitHub release page:
 <!-- auto-generated list of pull requests to the CLI starts here -->
 ```
 
+Typically, you want to link the [Flux upgrade](https://fluxcd.io/flux/installation/upgrade/)
+guide to refer users for up to date information on upgrade options.
+
 In some scenarios, you may want to include specific information about API
 changes and/or upgrade procedures. Consult [the formatting of
 `v2.0.0-rc.1`](https://github.com/fluxcd/flux2/releases/tag/v2.0.0-rc.1) for
@@ -69,4 +72,4 @@ The following template can be used for the Slack release message:
 ```
 
 For more concrete examples, see the pinned messages in the [Flux Slack
-channel](https://cloud-native.slack.com/archives/CLAJ40HV3).
+channel](https://cloud-native.slack.com/archives/CLAJ40HV3).

internal/build/diff.go

@@ -146,14 +146,18 @@ func (b *Builder) diff() (string, bool, error) {
 			}
 
 			if !kustomizationsEqual(k, b.kustomization) {
-				subOutput, subCreatedOrDrifted, err := b.kustomizationDiff(k)
+				if k.Spec.KubeConfig != nil {
-				if err != nil {
+					output.WriteString(writeString(fmt.Sprintf("⚠️ %s skipped: diff not supported for remote clusters\n", ssautil.FmtUnstructured(obj)), bunt.Orange))
-					diffErrs = append(diffErrs, err)
+				} else {
-				}
+					subOutput, subCreatedOrDrifted, err := b.kustomizationDiff(k)
-				if subCreatedOrDrifted {
+					if err != nil {
-					createdOrDrifted = true
+						diffErrs = append(diffErrs, err)
-					output.WriteString(bunt.Sprint(fmt.Sprintf("📁 %s changed\n", ssautil.FmtUnstructured(obj))))
+					}
-					output.WriteString(subOutput)
+					if subCreatedOrDrifted {
+						createdOrDrifted = true
+						output.WriteString(bunt.Sprint(fmt.Sprintf("📁 %s changed\n", ssautil.FmtUnstructured(obj))))
+						output.WriteString(subOutput)
+					}
 				}
 
 				// finished with Kustomization diff

internal/flags/kustomization_source.go

@@ -53,7 +53,7 @@ func (s *KustomizationSource) Set(str string) error {
 	}
 	if sourceKind == "" {
 		if utils.ContainsItemString(supportedKustomizationSourceKinds, sourceName) {
-			return fmt.Errorf("no name given for source of kind '%s'", sourceName)
+			return fmt.Errorf("no kind specified for source '%s'", sourceName)
 		}
 		sourceKind = sourcev1.GitRepositoryKind
 	}