Merge branch 'projectsveltos:main' into feature/extend-log-command-managed-clusters-v2

Author: AdamSadek

.github/workflows/main.yaml

@@ -16,9 +16,9 @@ jobs:
     - name: checkout
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up Go
-      uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       with:
-        go-version: 1.22.7
+        go-version: 1.24.1
     - name: Build
       run: make build
     - name: FMT
@@ -35,9 +35,9 @@ jobs:
     - name: checkout
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up Go
-      uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       with:
-        go-version: 1.22.7
+        go-version: 1.24.1
     - name: ut
       run: make test
       env:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.7 AS builder
+FROM golang:1.24.1 AS builder
 
 ARG ARCH
 ARG GIT_VERSION=unknown

Makefile

@@ -35,7 +35,7 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
 
-GOLANGCI_LINT_VERSION := "v1.61.0"
+GOLANGCI_LINT_VERSION := "v1.64.7"
 
 KUSTOMIZE_VER := v5.3.0
 KUSTOMIZE_BIN := kustomize
@@ -44,7 +44,7 @@ KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
 $(KUSTOMIZE): # Build kustomize from tools folder.
 	CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
 
-CONVERSION_GEN_VER := v0.31.0
+CONVERSION_GEN_VER := v0.32.0
 CONVERSION_GEN_BIN := conversion-gen
 # We are intentionally using the binary without version suffix, to avoid the version
 # in generated files.
@@ -60,7 +60,7 @@ $(CONVERSION_GEN_BIN): $(CONVERSION_GEN) ## Build a local copy of conversion-gen
 $(CONVERSION_GEN): # Build conversion-gen from tools folder.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(CONVERSION_GEN_PKG) $(CONVERSION_GEN_BIN) $(CONVERSION_GEN_VER)
 
-SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
+SETUP_ENVTEST_VER := release-0.20
 SETUP_ENVTEST_BIN := setup-envtest
 SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
 SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -120,23 +120,10 @@ generate: ## Run all generate-manifests-*, generate-go-deepcopy-*
 	echo "---" >> manifest/manifest.yaml
 	cat tmp/apiextensions.k8s.io_v1_customresourcedefinition_snapshots.utils.projectsveltos.io.yaml >> manifest/manifest.yaml
 	echo "---" >> manifest/manifest.yaml
-	cat tmp/apiextensions.k8s.io_v1_customresourcedefinition_techsupports.utils.projectsveltos.io.yaml >> manifest/manifest.yaml
 	rm -rf tmp
 	MANIFEST_IMG=$(SVELTOSCTL_IMG) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
 	$(MAKE) fmt
 
-.PHONY: generate-go-conversions
-generate-go-conversions: $(CONVERSION_GEN) ## Generate conversions go code for utils.projectsveltos.io api
-	$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha1"
-	$(CONVERSION_GEN) \
-		--output-file=zz_generated.conversion.go \
-		--go-header-file=./hack/boilerplate.generatego.txt \
-		./api/v1alpha1
-
-.PHONY: clean-generated-conversions
-clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs. Example SRC_DIRS="./api/v1alpha4"
-	(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)
-
 set-manifest-image:
 	sed -i'' -e 's@image: .*@image: '"docker.io/${MANIFEST_IMG}:$(MANIFEST_TAG)"'@' ./manifest/manifest.yaml
 

README.md

@@ -73,8 +73,6 @@ You might also want to change the timezone of sveltosctl pod by using specific t
   - [Multi-tenancy: display admin permissions](#multi-tenancy-display-admin-permissions)
   - [Log severity settings](#log-severity-settings)
   - [Display outcome of ClusterProfile/Profile in DryRun mode](#display-outcome-of-clusterprofile-in-dryrun-mode)
-  - [Techsupport](#techsupport)
-    - [list](#list)
   - [Snapshot](#snapshot)
     - [list](#list-1)
     - [diff](#diff)
@@ -248,57 +246,6 @@ Usage:
      --profile=<name>   Show which Kubernetes addons would change because of this clusterprofile/profile. If not specified all clusterprofiles/profiles are considered.
 ```
 
-## Techsupport
-
-When running sveltosctl as pod in the management cluster, it can take collect techsupports (both logs and resources).
-
-Define a Techsupport instance, following for instance will collect a techsupport every hour, collecting:
- 
-1. logs for all pods in kube-system namespace (last 10 minutes,i.e, 600 seconds, of logs);
-2. All Secrets and Deployments
-
-from all managed clusters matching cluster selectors __env=fv__
-
-```
-apiVersion: utils.projectsveltos.io/v1beta1
-kind: Techsupport
-metadata:
- name: hourly
-spec:
- clusterSelector:
-   matchLabels:
-     env: fv
- schedule: “00 * * * *”
- storage: /techsupport
- logs:
- - namespace: kube-system
-   sinceSeconds: 600
- resources:
- - group: “”
-   version: v1
-   kind: Secret
- - group: “”
-   version: v1
-   kind: Deployment
-```
-
-where field _schedule_ is defined in [Cron format](https://en.wikipedia.org/wiki/Cron).
-
-
-### list
-  
-**techsupport list** can be used to display all collected techsupports:
-
-```
-kubectl exec -it -n projectsveltos sveltosctl-0 -- ./sveltosctl techsupport list --techsupport=hourly 
-+--------------------+---------------------+
-| TECHSUPPORT POLICY |        DATE         |
-+--------------------+---------------------+
-| hourly             | 2022-10-10:22:00:00 |
-| hourly             | 2022-10-10:23:00:00 |
-+--------------------+---------------------+
-```
-
 ## Snapshot
 
 When running sveltosctl as pod in the management cluster, it can take configuration snapshot.