Skip to content

Commit 7739396

Browse files
akshayhavileakshayhavile
authored
Merge pull request #1730 from akshayhavile/release-1.13.2-istio-sec-fix
Istio security issue fix
2 parents 1b74bda + 907fdfc commit 7739396

File tree

8,264 files changed

+1652837
-189917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,264 files changed

+1652837
-189917
lines changed

‎.github/workflows/go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Golangci-lint
1616
strategy:
1717
matrix:
18-
platform: [ ubuntu-20.04 ]
18+
platform: [ ubuntu-24.04 ]
1919
runs-on: ${{ matrix.platform }}
2020
steps:
2121
- name: Set up Go 1.23.8

‎ako-gateway-api/k8s/gateway_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var ctrlonce sync.Once
4343
type GatewayController struct {
4444
worker_id uint32
4545
informers *utils.Informers
46-
workqueue []workqueue.RateLimitingInterface
46+
workqueue []workqueue.RateLimitingInterface //nolint:staticcheck
4747
DisableSync bool
4848
}
4949

‎ako-operator/controllers/akoconfig_controller.go

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
1515
limitations under the License.
1616
*/
1717

18+
//nolint:unparam
1819
package controllers
1920

2021
import (
@@ -237,12 +238,14 @@ func (r *AKOConfigReconciler) CleanupArtifacts(ctx context.Context, log logr.Log
237238
} else {
238239
objList[getSAName()] = &sa
239240
}
241+
240242
var psp policyv1beta1.PodSecurityPolicy
241243
if err := r.Get(ctx, getPSPName(), &psp); err != nil {
242244
log.V(0).Info("error getting podsecuritypolicy", "error", err)
243245
} else {
244246
objList[getPSPName()] = &psp
245247
}
248+
246249
var gwClass gatewayv1beta1.GatewayClass
247250
if err := r.Get(ctx, getGWClassName(), &gwClass); err != nil {
248251
log.V(0).Info("error getting gatewayclass", "error", err)

‎ako-operator/controllers/psp.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
*/
17+
18+
//nolint:unparam
1719
package controllers
1820

1921
import (
2022
"context"
2123
"reflect"
2224

23-
"github.com/go-logr/logr"
25+
logr "github.com/go-logr/logr"
26+
akov1alpha1 "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-operator/api/v1alpha1"
2427
policyv1beta1 "k8s.io/api/policy/v1beta1"
2528
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2629
"k8s.io/apimachinery/pkg/types"
27-
28-
akov1alpha1 "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-operator/api/v1alpha1"
2930
)
3031

3132
func createOrUpdatePodSecurityPolicy(ctx context.Context, ako akov1alpha1.AKOConfig, log logr.Logger, r *AKOConfigReconciler) error {
32-
var oldPSP policyv1beta1.PodSecurityPolicy
33+
34+
var oldPSP policyv1beta1.PodSecurityPolicy //nolint:errcheck
3335

3436
if err := r.Get(ctx, getPSPName(), &oldPSP); err != nil {
3537
log.V(0).Info("no pre-existing podsecuritypolicy with name", "name", PSPName)

‎ako-operator/go.mod

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
module github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-operator
2+
3+
go 1.23.8
4+
5+
toolchain go1.24.1
6+
7+
require (
8+
github.com/go-logr/logr v1.4.2
9+
github.com/onsi/gomega v1.35.1
10+
github.com/vmware/load-balancer-and-ingress-services-for-kubernetes v0.1.0
11+
k8s.io/api v0.32.1
12+
k8s.io/apiextensions-apiserver v0.28.3
13+
k8s.io/apimachinery v0.32.1
14+
k8s.io/client-go v0.32.1
15+
sigs.k8s.io/controller-runtime v0.16.3
16+
sigs.k8s.io/gateway-api v1.0.0
17+
)
18+
19+
require (
20+
github.com/beorn7/perks v1.0.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
23+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
24+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
25+
github.com/fsnotify/fsnotify v1.7.0 // indirect
26+
github.com/go-logr/zapr v1.2.4 // indirect
27+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
28+
github.com/go-openapi/jsonreference v0.20.2 // indirect
29+
github.com/go-openapi/swag v0.23.0 // indirect
30+
github.com/gogo/protobuf v1.3.2 // indirect
31+
github.com/golang/glog v1.0.0 // indirect
32+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33+
github.com/golang/protobuf v1.5.4 // indirect
34+
github.com/google/gnostic-models v0.6.8 // indirect
35+
github.com/google/go-cmp v0.6.0 // indirect
36+
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/uuid v1.6.0 // indirect
38+
github.com/imdario/mergo v0.3.16 // indirect
39+
github.com/josharian/intern v1.0.0 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
41+
github.com/mailru/easyjson v0.7.7 // indirect
42+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
43+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44+
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
46+
github.com/openshift/api v0.0.0-20201019163320-c6a5ec25f267 // indirect
47+
github.com/openshift/client-go v0.0.0-20201020082437-7737f16e53fc // indirect
48+
github.com/pkg/errors v0.9.1 // indirect
49+
github.com/prometheus/client_golang v1.17.0 // indirect
50+
github.com/prometheus/client_model v0.5.0 // indirect
51+
github.com/prometheus/common v0.45.0 // indirect
52+
github.com/prometheus/procfs v0.12.0 // indirect
53+
github.com/spf13/pflag v1.0.5 // indirect
54+
github.com/vmware-tanzu/service-apis v0.0.0-20200901171416-461d35e58618 // indirect
55+
github.com/vmware/alb-sdk v0.0.0-20250407104238-8f88209a8f1a // indirect
56+
go.uber.org/multierr v1.11.0 // indirect
57+
go.uber.org/zap v1.26.0 // indirect
58+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
59+
golang.org/x/net v0.38.0 // indirect
60+
golang.org/x/oauth2 v0.23.0 // indirect
61+
golang.org/x/sys v0.31.0 // indirect
62+
golang.org/x/term v0.30.0 // indirect
63+
golang.org/x/text v0.23.0 // indirect
64+
golang.org/x/time v0.7.0 // indirect
65+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
66+
google.golang.org/protobuf v1.36.0 // indirect
67+
gopkg.in/inf.v0 v0.9.1 // indirect
68+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
69+
gopkg.in/yaml.v3 v3.0.1 // indirect
70+
k8s.io/component-base v0.28.3 // indirect
71+
k8s.io/klog/v2 v2.130.1 // indirect
72+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
73+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
74+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
75+
sigs.k8s.io/service-apis v0.1.0 // indirect
76+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
77+
sigs.k8s.io/yaml v1.4.0 // indirect
78+
)
79+
80+
replace (
81+
github.com/vmware/load-balancer-and-ingress-services-for-kubernetes => ../
82+
k8s.io/api => k8s.io/api v0.28.3
83+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
84+
k8s.io/client-go => k8s.io/client-go v0.28.3
85+
)

0 commit comments

Comments
 (0)