Skip to content

Commit af8244e

Browse files
namkyu1999namkyu1999
authored
update: pinning k8s version to 1.26 (#507)
* update: pinning k8s version to 1.26 Signed-off-by: namkyu1999 <[email protected]> * Fix: add flags to the golangci Signed-off-by: namkyu1999 <[email protected]> * fix: update base image because of the CVE-2024-3596 Signed-off-by: namkyu1999 <[email protected]> --------- Signed-off-by: namkyu1999 <[email protected]>
1 parent 0e85028 commit af8244e

File tree

7 files changed

+177
-1100
lines changed

7 files changed

+177
-1100
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323

2424
- name: golangci-lint
2525
uses: reviewdog/action-golangci-lint@v2
26+
with:
27+
golangci_lint_flags: "--timeout=10m"
2628

2729
- name: unused-package check
2830
run: make unused-package-check

‎build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN go env
1717
RUN CGO_ENABLED=0 go build -buildvcs=false -o /output/chaos-operator -v ./main.go
1818

1919
# Packaging stage
20-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
20+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
2121

2222
LABEL maintainer="LitmusChaos"
2323

‎controllers/chaosengine_controller.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ package controllers
1919
import (
2020
"context"
2121
"fmt"
22+
"os"
23+
"reflect"
24+
"strings"
25+
"time"
26+
2227
"github.com/go-logr/logr"
2328
litmuschaosv1alpha1 "github.com/litmuschaos/chaos-operator/api/litmuschaos/v1alpha1"
2429
"github.com/litmuschaos/chaos-operator/pkg/analytics"
@@ -37,14 +42,10 @@ import (
3742
"k8s.io/apimachinery/pkg/runtime/schema"
3843
"k8s.io/apimachinery/pkg/types"
3944
"k8s.io/client-go/tools/record"
40-
"os"
41-
"reflect"
4245
ctrl "sigs.k8s.io/controller-runtime"
4346
"sigs.k8s.io/controller-runtime/pkg/client"
4447
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4548
"sigs.k8s.io/controller-runtime/pkg/reconcile"
46-
"strings"
47-
"time"
4849
)
4950

5051
const finalizer = "chaosengine.litmuschaos.io/finalizer"
@@ -111,7 +112,7 @@ func (r *ChaosEngineReconciler) Reconcile(ctx context.Context, request ctrl.Requ
111112

112113
// Handling of normal execution of ChaosEngine
113114
if engine.Instance.Spec.EngineState == litmuschaosv1alpha1.EngineStateActive && engine.Instance.Status.EngineStatus == litmuschaosv1alpha1.EngineStatusInitialized {
114-
return r.reconcileForCreationAndRunning(engine, reqLogger)
115+
return r.reconcileForCreationAndRunning(engine, *reqLogger)
115116
}
116117

117118
// Handling Graceful completion of ChaosEngine
@@ -679,11 +680,11 @@ func updateExperimentStatusesForStop(engine *chaosTypes.EngineInfo) {
679680
}
680681
}
681682

682-
func startReqLogger(request reconcile.Request) logr.Logger {
683+
func startReqLogger(request reconcile.Request) *logr.Logger {
683684
reqLogger := chaosTypes.Log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
684685
reqLogger.Info("Reconciling ChaosEngine")
685686

686-
return reqLogger
687+
return &reqLogger
687688
}
688689

689690
func (r *ChaosEngineReconciler) updateEngineForComplete(engine *chaosTypes.EngineInfo, isCompleted bool) (bool, error) {
@@ -826,7 +827,7 @@ func isResultCRDAvailable() (bool, error) {
826827
Resource: "customresourcedefinitions",
827828
}
828829

829-
resultList, err := (*dynamicClient).Resource(gvr).List(context.Background(), v1.ListOptions{})
830+
resultList, err := dynamicClient.Resource(gvr).List(context.Background(), v1.ListOptions{})
830831
if err != nil {
831832
return false, err
832833
}

‎go.mod‎

Lines changed: 58 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,115 +3,106 @@ module github.com/litmuschaos/chaos-operator
33
go 1.22
44

55
require (
6-
cloud.google.com/go v0.81.0 // indirect
7-
github.com/go-logr/logr v1.2.3
8-
github.com/google/go-cmp v0.5.6 // indirect
6+
github.com/go-logr/logr v1.4.2
7+
github.com/google/go-cmp v0.5.9 // indirect
98
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
109
github.com/litmuschaos/elves v0.0.0-20230607095010-c7119636b529
1110
github.com/pkg/errors v0.9.1
1211
github.com/spf13/pflag v1.0.5 // indirect
13-
golang.org/x/crypto v0.16.0 // indirect
14-
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
15-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
16-
k8s.io/api v0.26.0
17-
k8s.io/apimachinery v0.26.0
12+
golang.org/x/oauth2 v0.7.0 // indirect
13+
k8s.io/api v0.26.15
14+
k8s.io/apimachinery v0.26.15
1815
k8s.io/client-go v12.0.0+incompatible
19-
sigs.k8s.io/controller-runtime v0.10.0
16+
sigs.k8s.io/controller-runtime v0.14.6
2017
)
2118

2219
require (
2320
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
2421
github.com/google/martian v2.1.0+incompatible
25-
github.com/onsi/ginkgo v1.16.4
26-
github.com/onsi/gomega v1.15.0
27-
github.com/operator-framework/operator-sdk v0.19.0
28-
github.com/stretchr/testify v1.7.0
22+
github.com/onsi/ginkgo v1.16.5
23+
github.com/onsi/gomega v1.24.2
24+
github.com/stretchr/testify v1.8.2
2925
k8s.io/klog v1.0.0
3026
)
3127

3228
require (
33-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
34-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
35-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
36-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
37-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
38-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3929
github.com/beorn7/perks v1.0.1 // indirect
40-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4131
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
43-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
44-
github.com/fsnotify/fsnotify v1.4.9 // indirect
45-
github.com/go-logr/zapr v0.4.0 // indirect
32+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
33+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
34+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
35+
github.com/fsnotify/fsnotify v1.6.0 // indirect
36+
github.com/go-logr/zapr v1.2.3 // indirect
37+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
38+
github.com/go-openapi/jsonreference v0.20.0 // indirect
39+
github.com/go-openapi/swag v0.19.14 // indirect
4640
github.com/gogo/protobuf v1.3.2 // indirect
4741
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
48-
github.com/golang/protobuf v1.5.2 // indirect
42+
github.com/golang/protobuf v1.5.4 // indirect
43+
github.com/google/gnostic v0.5.7-v3refs // indirect
4944
github.com/google/gofuzz v1.1.0 // indirect
50-
github.com/google/uuid v1.1.2 // indirect
51-
github.com/googleapis/gnostic v0.5.5 // indirect
52-
github.com/hashicorp/golang-lru v0.5.3 // indirect
45+
github.com/google/uuid v1.3.0 // indirect
5346
github.com/imdario/mergo v0.3.12 // indirect
47+
github.com/josharian/intern v1.0.0 // indirect
5448
github.com/json-iterator/go v1.1.12 // indirect
55-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
49+
github.com/mailru/easyjson v0.7.6 // indirect
50+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
5651
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5752
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5854
github.com/nxadm/tail v1.4.8 // indirect
5955
github.com/pmezard/go-difflib v1.0.0 // indirect
60-
github.com/prometheus/client_golang v1.12.1 // indirect
61-
github.com/prometheus/client_model v0.2.0 // indirect
62-
github.com/prometheus/common v0.32.1 // indirect
63-
github.com/prometheus/procfs v0.7.3 // indirect
56+
github.com/prometheus/client_golang v1.14.0 // indirect
57+
github.com/prometheus/client_model v0.3.0 // indirect
58+
github.com/prometheus/common v0.37.0 // indirect
59+
github.com/prometheus/procfs v0.8.0 // indirect
6460
go.uber.org/atomic v1.7.0 // indirect
6561
go.uber.org/multierr v1.6.0 // indirect
66-
go.uber.org/zap v1.19.0 // indirect
67-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
62+
go.uber.org/zap v1.24.0 // indirect
6863
golang.org/x/net v0.19.0 // indirect
6964
golang.org/x/sys v0.15.0 // indirect
7065
golang.org/x/term v0.15.0 // indirect
7166
golang.org/x/text v0.14.0 // indirect
72-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
73-
golang.org/x/tools v0.16.1 // indirect
67+
golang.org/x/time v0.3.0 // indirect
7468
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
7569
google.golang.org/appengine v1.6.7 // indirect
76-
google.golang.org/protobuf v1.26.0 // indirect
70+
google.golang.org/protobuf v1.33.0 // indirect
7771
gopkg.in/inf.v0 v0.9.1 // indirect
7872
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7973
gopkg.in/yaml.v2 v2.4.0 // indirect
8074
gopkg.in/yaml.v3 v3.0.1 // indirect
81-
k8s.io/apiextensions-apiserver v0.22.1 // indirect
82-
k8s.io/component-base v0.22.2 // indirect
75+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
76+
k8s.io/component-base v0.26.15 // indirect
8377
k8s.io/klog/v2 v2.80.1 // indirect
84-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
85-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
78+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
79+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
80+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
8681
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
87-
sigs.k8s.io/yaml v1.2.0 // indirect
82+
sigs.k8s.io/yaml v1.3.0 // indirect
8883
)
8984

90-
// Pinned to kubernetes-1.21.2
85+
// Pinned to kubernetes-1.26
9186
replace (
92-
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
93-
k8s.io/api => k8s.io/api v0.21.2
94-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.2
95-
k8s.io/apimachinery => k8s.io/apimachinery v0.21.2
96-
k8s.io/apiserver => k8s.io/apiserver v0.21.2
97-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.2
98-
k8s.io/client-go => k8s.io/client-go v0.21.2
99-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.2
100-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.2
101-
k8s.io/code-generator => k8s.io/code-generator v0.21.2
102-
k8s.io/component-base => k8s.io/component-base v0.21.2
103-
k8s.io/cri-api => k8s.io/cri-api v0.21.2
104-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.2
105-
k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
106-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.2
107-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.2
108-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.2
109-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.2
110-
k8s.io/kubectl => k8s.io/kubectl v0.21.2
111-
k8s.io/kubelet => k8s.io/kubelet v0.21.2
112-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.2
113-
k8s.io/metrics => k8s.io/metrics v0.21.2
114-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.2
87+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.6
88+
github.com/go-logr/logr => github.com/go-logr/logr v1.4.2
89+
k8s.io/api => k8s.io/api v0.26.15
90+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.15
91+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.15
92+
k8s.io/client-go => k8s.io/client-go v0.26.15
93+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.15
94+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.15
95+
k8s.io/component-base => k8s.io/component-base v0.26.15
96+
k8s.io/cri-api => k8s.io/cri-api v0.26.15
97+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.15
98+
k8s.io/klog/v2 => k8s.io/klog/v2 v2.80.1
99+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.15
100+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.15
101+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.15
102+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.15
103+
k8s.io/kubelet => k8s.io/kubelet v0.26.15
104+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.15
105+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.15
115106
)
116107

117108
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm

0 commit comments

Comments
 (0)