Upgrade Go/kpt dependencies and disable govet inline analyzer (kptdev#1017)

* Upgrade Go/kpt dependencies and fix golangci-lint inline analyzer.

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

* Address review comments.

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

* Replace subpackage Upstream references to use the return type of latest sdk (github.com/kptdev/krm-functions-sdk/go/fn/kptfileapi)

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

---------

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>
Co-authored-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

Author: aravindtga

.golangci.json

@@ -43,6 +43,11 @@
           "text": "SA1019.*client\\.Apply"
         }
       ]
+    },
+    "settings": {
+      "govet": {
+        "disable": ["inline"]
+      }
     }
   },
   "run": {

Makefile

@@ -19,8 +19,8 @@ export PORCHDIR=$(abspath $(CURDIR))
 
 # Base image versions
 export ALPINE_VERSION ?= 3.23.3
-export GOLANG_BOOKWORM_VERSION ?= 1.26.0-bookworm
-export GOLANG_ALPINE_VERSION ?= 1.26.0-alpine
+export GOLANG_BOOKWORM_VERSION ?= 1.26.3-bookworm
+export GOLANG_ALPINE_VERSION ?= 1.26.3-alpine
 
 export DEPLOYPORCHCONFIGDIR ?= $(BUILDDIR)/deploy
 DEPLOYKPTCONFIGDIR=$(BUILDDIR)/kpt_pkgs
@@ -70,7 +70,7 @@ include make/infra.mk        # docker-build, docker-push, help (+ container runt
 include make/go.mk           # fmt, vet, lint, fix-headers, fix-all
 include make/testing.mk      # test, unit, unit-clean, vulncheck, test-e2e*
 include make/security.mk     # gosec, gosec-sarif
-include make/mocks.mk        # install-mockery, generate-mocks, clean-mocks
+include make/mocks.mk        # generate-mocks, clean-mocks
 
 .DEFAULT_GOAL := help
 

controllers/main.go

@@ -27,11 +27,13 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/exp/slices"
+
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/exp/slices"
+
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/klog/v2"

controllers/packagerevisions/pkg/controllers/packagerevision/labels_test.go

@@ -1,3 +1,17 @@
+// Copyright 2026 The kpt Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package packagerevision
 
 import (
@@ -156,7 +170,8 @@ func TestUpdateLatestRevisionLabels(t *testing.T) {
 	}
 }
 
-func TestUpdateLatestRevisionLabelsListError(t *testing.T) {	mockClient := mockclient.NewMockClient(t)
+func TestUpdateLatestRevisionLabelsListError(t *testing.T) {
+	mockClient := mockclient.NewMockClient(t)
 	mockClient.EXPECT().List(mock.Anything, mock.AnythingOfType("*v1alpha2.PackageRevisionList"), mock.Anything, mock.Anything).
 		Return(assert.AnError)
 

controllers/packagerevisions/pkg/controllers/packagerevision/render_test.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	porchv1alpha2 "github.com/kptdev/porch/api/porch/v1alpha2"
+	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 )
@@ -58,19 +58,19 @@ func TestRenderTrigger(t *testing.T) {
 			wantAnno: false, wantSource: false,
 		},
 		{
-			name:     "annotation trigger — new annotation",
-			pr:       prWithRenderState("v1", "", "", "", ""),
-			wantReq:  "v1", wantAnno: true, wantSource: false,
+			name:    "annotation trigger — new annotation",
+			pr:      prWithRenderState("v1", "", "", "", ""),
+			wantReq: "v1", wantAnno: true, wantSource: false,
 		},
 		{
-			name:     "annotation trigger — annotation differs from observed",
-			pr:       prWithRenderState("v2", "v1", "", "", metav1.ConditionTrue),
-			wantReq:  "v2", wantAnno: true, wantSource: false,
+			name:    "annotation trigger — annotation differs from observed",
+			pr:      prWithRenderState("v2", "v1", "", "", metav1.ConditionTrue),
+			wantReq: "v2", wantAnno: true, wantSource: false,
 		},
 		{
-			name:     "no annotation trigger — annotation matches observed",
-			pr:       prWithRenderState("v1", "v1", "", "", metav1.ConditionTrue),
-			wantReq:  "v1", wantAnno: false, wantSource: false,
+			name:    "no annotation trigger — annotation matches observed",
+			pr:      prWithRenderState("v1", "v1", "", "", metav1.ConditionTrue),
+			wantReq: "v1", wantAnno: false, wantSource: false,
 		},
 		{
 			name:     "source trigger — creationSource set, not rendered",
@@ -88,9 +88,9 @@ func TestRenderTrigger(t *testing.T) {
 			wantAnno: false, wantSource: false,
 		},
 		{
-			name:     "both triggers",
-			pr:       prWithRenderState("v1", "", "", "init", metav1.ConditionUnknown),
-			wantReq:  "v1", wantAnno: true, wantSource: true,
+			name:    "both triggers",
+			pr:      prWithRenderState("v1", "", "", "init", metav1.ConditionUnknown),
+			wantReq: "v1", wantAnno: true, wantSource: true,
 		},
 		{
 			name:     "source trigger on render failure",
@@ -109,7 +109,6 @@ func TestRenderTrigger(t *testing.T) {
 	}
 }
 
-
 func TestIsRenderStale(t *testing.T) {
 	assert.True(t, isRenderStale("v2", "v1"))
 	assert.False(t, isRenderStale("v1", "v1"))
@@ -184,7 +183,6 @@ func TestRenderRequestChanged(t *testing.T) {
 	}
 }
 
-
 func TestKptfileFromResources(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -244,7 +242,6 @@ info:
 	}
 }
 
-
 func TestKptRendererSuccess(t *testing.T) {
 	r := &kptRenderer{}
 	resources := map[string]string{
@@ -280,7 +277,6 @@ func TestKptRendererNoKptfile(t *testing.T) {
 	assert.Nil(t, result.results)
 }
 
-
 func TestMockRendererPipelineErr(t *testing.T) {
 	m := &mockRenderer{
 		resources:   map[string]string{"Kptfile": "rendered"},

docs/config.toml

@@ -1,5 +1,5 @@
 baseURL = 'https://docs.porch.nephio.org/'
-languageCode = 'en-us'
+Locale = 'en-us'
 title = 'Porch Documentation'
 
 # based on https://www.docsy.dev/docs/get-started/docsy-as-module/start-from-scratch/