arangodb · ajanikow · Jan 17, 2025 · Jan 17, 2025
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,7 +1,8 @@
 run:
   issues-exit-code: 3
   timeout: 30m
-  skip-dirs:
+issues:
+  exclude-dirs:
     - vendor
     - .gobuild
     - deps
@@ -20,6 +21,15 @@ linters:
     - importas
     - gci
 linters-settings:
+  govet:
+    disable:
+      - printf
+  staticcheck:
+    checks:
+      - all
+      - -SA1019
+  unparam:
+    check-exported: false
   importas:
     no-unaliased: true
     alias:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - (Feature) Helm Chart Values merge methods
 - (Feature) (Platform) Expose Route Name via Header
 - (Feature) (Platform) Route Upstream Timeout
+- (Maintenance) Fix CRD Generation and golangci version
 
 ## [1.2.43](https://github.com/arangodb/kube-arangodb/tree/1.2.43) (2024-10-14)
 - (Feature) ArangoRoute CRD

diff --git a/Makefile b/Makefile
@@ -774,11 +774,11 @@ init: vendor tools update-generated $(BIN)
 .PHONY: tools-min
 tools-min: update-vendor
 	@echo ">> Fetching golangci-lint linter"
-	@GOBIN=$(GOPATH)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2
+	@GOBIN=$(GOPATH)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
 	@echo ">> Fetching goimports"
 	@GOBIN=$(GOPATH)/bin go install golang.org/x/tools/cmd/goimports@v0.19.0
 	@echo ">> Fetching license check"
-	@GOBIN=$(GOPATH)/bin go install github.com/google/addlicense@6d92264d717064f28b32464f0f9693a5b4ef0239
+	@GOBIN=$(GOPATH)/bin go install github.com/google/addlicense@v1.1.1
 	@echo ">> Fetching yamlfmt"
 	@GOBIN=$(GOPATH)/bin go install github.com/google/yamlfmt/cmd/yamlfmt@v0.10.0
 	@echo ">> Fetching protolinter"

diff --git a/chart/kube-arangodb-arm64/crds/backups-backup.yaml b/chart/kube-arangodb-arm64/crds/backups-backup.yaml
@@ -57,47 +57,3 @@ spec:
           type: string
       subresources:
         status: {}
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - jsonPath: .spec.policyName
-          description: Policy name
-          name: Policy
-          type: string
-        - jsonPath: .spec.deployment.name
-          description: Deployment name
-          name: Deployment
-          type: string
-        - jsonPath: .status.backup.version
-          description: Backup Version
-          name: Version
-          type: string
-        - jsonPath: .status.backup.createdAt
-          description: Backup Creation Timestamp
-          name: Created
-          type: string
-        - jsonPath: .status.backup.sizeInBytes
-          description: Backup Size in Bytes
-          name: Size
-          type: integer
-          format: byte
-        - jsonPath: .status.backup.numberOfDBServers
-          description: Backup Number of the DB Servers
-          name: DBServers
-          type: integer
-        - jsonPath: .status.state
-          description: The actual state of the ArangoBackup
-          name: State
-          type: string
-        - jsonPath: .status.message
-          priority: 1
-          description: Message of the ArangoBackup object
-          name: Message
-          type: string
-      subresources:
-        status: {}
diff --git a/chart/kube-arangodb-arm64/crds/backups-backuppolicy.yaml b/chart/kube-arangodb-arm64/crds/backups-backuppolicy.yaml
@@ -37,26 +37,3 @@ spec:
           type: string
       subresources:
         status: {}
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
-      additionalPrinterColumns:
        - jsonPath: .spec.schedule
-          description: Schedule
-          name: Schedule
-          type: string
-        - jsonPath: .status.scheduled
-          description: Scheduled
-          name: Scheduled
-          type: string
-        - jsonPath: .status.message
-          priority: 1
-          description: Message of the ArangoBackupPolicy object
-          name: Message
-          type: string
-      subresources:
-        status: {}
diff --git a/chart/kube-arangodb-arm64/crds/database-deployment.yaml b/chart/kube-arangodb-arm64/crds/database-deployment.yaml
@@ -21,13 +21,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-arm64/crds/database-task.yaml b/chart/kube-arangodb-arm64/crds/database-task.yaml
@@ -18,13 +18,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-arm64/crds/replication-deploymentreplication.yaml b/chart/kube-arangodb-arm64/crds/replication-deploymentreplication.yaml
@@ -20,13 +20,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-enterprise-arm64/crds/backups-backup.yaml b/chart/kube-arangodb-enterprise-arm64/crds/backups-backup.yaml
@@ -57,47 +57,3 @@ spec:
           type: string
       subresources:
         status: {}
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - jsonPath: .spec.policyName
-          description: Policy name
-          name: Policy
-          type: string
-        - jsonPath: .spec.deployment.name
-          description: Deployment name
-          name: Deployment
-          type: string
-        - jsonPath: .status.backup.version
-          description: Backup Version
-          name: Version
-          type: string
-        - jsonPath: .status.backup.createdAt
-          description: Backup Creation Timestamp
-          name: Created
-          type: string
-        - jsonPath: .status.backup.sizeInBytes
-          description: Backup Size in Bytes
-          name: Size
-          type: integer
-          format: byte
-        - jsonPath: .status.backup.numberOfDBServers
-          description: Backup Number of the DB Servers
-          name: DBServers
-          type: integer
-        - jsonPath: .status.state
-          description: The actual state of the ArangoBackup
-          name: State
-          type: string
-        - jsonPath: .status.message
-          priority: 1
-          description: Message of the ArangoBackup object
-          name: Message
-          type: string
-      subresources:
-        status: {}
diff --git a/chart/kube-arangodb-enterprise-arm64/crds/backups-backuppolicy.yaml b/chart/kube-arangodb-enterprise-arm64/crds/backups-backuppolicy.yaml
@@ -37,26 +37,3 @@ spec:
           type: string
       subresources:
         status: {}
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - jsonPath: .spec.schedule
-          description: Schedule
-          name: Schedule
-          type: string
-        - jsonPath: .status.scheduled
-          description: Scheduled
-          name: Scheduled
-          type: string
-        - jsonPath: .status.message
-          priority: 1
-          description: Message of the ArangoBackupPolicy object
-          name: Message
-          type: string
-      subresources:
-        status: {}
diff --git a/chart/kube-arangodb-enterprise-arm64/crds/database-deployment.yaml b/chart/kube-arangodb-enterprise-arm64/crds/database-deployment.yaml
@@ -21,13 +21,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-enterprise-arm64/crds/database-task.yaml b/chart/kube-arangodb-enterprise-arm64/crds/database-task.yaml
@@ -18,13 +18,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-enterprise-arm64/crds/replication-deploymentreplication.yaml b/chart/kube-arangodb-enterprise-arm64/crds/replication-deploymentreplication.yaml
@@ -20,13 +20,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-enterprise/crds/backups-backup.yaml b/chart/kube-arangodb-enterprise/crds/backups-backup.yaml
@@ -57,47 +57,3 @@ spec:
           type: string
       subresources:
         status: {}
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - jsonPath: .spec.policyName
-          description: Policy name
-          name: Policy
-          type: string
-        - jsonPath: .spec.deployment.name
-          description: Deployment name
-          name: Deployment
-          type: string
-        - jsonPath: .status.backup.version
-          description: Backup Version
-          name: Version
-          type: string
-        - jsonPath: .status.backup.createdAt
-          description: Backup Creation Timestamp
-          name: Created
-          type: string
-        - jsonPath: .status.backup.sizeInBytes
-          description: Backup Size in Bytes
-          name: Size
-          type: integer
-          format: byte
-        - jsonPath: .status.backup.numberOfDBServers
-          description: Backup Number of the DB Servers
-          name: DBServers
-          type: integer
-        - jsonPath: .status.state
-          description: The actual state of the ArangoBackup
-          name: State
-          type: string
-        - jsonPath: .status.message
-          priority: 1
-          description: Message of the ArangoBackup object
-          name: Message
-          type: string
-      subresources:
-        status: {}
diff --git a/chart/kube-arangodb-enterprise/crds/backups-backuppolicy.yaml b/chart/kube-arangodb-enterprise/crds/backups-backuppolicy.yaml
@@ -37,26 +37,3 @@ spec:
           type: string
       subresources:
         status: {}
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - jsonPath: .spec.schedule
-          description: Schedule
-          name: Schedule
-          type: string
-        - jsonPath: .status.scheduled
-          description: Scheduled
-          name: Scheduled
-          type: string
-        - jsonPath: .status.message
-          priority: 1
-          description: Message of the ArangoBackupPolicy object
-          name: Message
-          type: string
-      subresources:
-        status: {}
diff --git a/chart/kube-arangodb-enterprise/crds/database-deployment.yaml b/chart/kube-arangodb-enterprise/crds/database-deployment.yaml
@@ -21,13 +21,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-enterprise/crds/database-task.yaml b/chart/kube-arangodb-enterprise/crds/database-task.yaml
@@ -18,13 +18,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema:

diff --git a/chart/kube-arangodb-enterprise/crds/replication-deploymentreplication.yaml b/chart/kube-arangodb-enterprise/crds/replication-deploymentreplication.yaml
@@ -20,13 +20,6 @@ spec:
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-    - name: v1alpha
-      schema:
-        openAPIV3Schema:
-          type: object
-          x-kubernetes-preserve-unknown-fields: true
-      served: true
-      storage: false
     - name: v2alpha1
       schema:
         openAPIV3Schema: