arangodb · ajanikow · Aug 28, 2024 · Aug 27, 2024
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -103,6 +103,10 @@ linters-settings:
         alias: pbConfigV1
       - pkg: github.com/arangodb/kube-arangodb/integrations/config/v1
         alias: pbImplConfigV1
+      - pkg: github.com/arangodb/kube-arangodb/integrations/pong/v1/definition
+        alias: pbPongV1
+      - pkg: github.com/arangodb/kube-arangodb/integrations/pong/v1
+        alias: pbImplPongV1
       - pkg: github.com/arangodb/kube-arangodb/integrations/shared/v1/definition
         alias: pbSharedV1
       - pkg: github.com/arangodb/kube-arangodb/integrations/shared/v1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - (Feature) ConfigV1 Integration Service
 - (Feature) Integration Service Authentication
 - (Improvement) Better panic handling
+- (Feature) PongV1 Integration Service
 
 ## [1.2.42](https://github.com/arangodb/kube-arangodb/tree/1.2.42) (2024-07-23)
 - (Maintenance) Go 1.22.4 & Kubernetes 1.29.6 libraries

diff --git a/Makefile b/Makefile
@@ -917,6 +917,6 @@ sync-charts:
 sync: sync-charts
 
 ci-check:
-	@$(MAKE) tidy vendor update-generated synchronize-v2alpha1-with-v1 generate-internal sync fmt yamlfmt license
+	@$(MAKE) tidy vendor generate update-generated synchronize-v2alpha1-with-v1 sync fmt yamlfmt license
 	@git checkout -- go.sum # ignore changes in go.sum
 	@if [ ! -z "$(git status --porcelain)" ]; then echo "There are uncommited changes!"; git status; exit 1; fi
diff --git a/README.md b/README.md
@@ -182,7 +182,7 @@ Flags:
       --kubernetes.max-batch-size int                          Size of batch during objects read (default 256)
       --kubernetes.qps float32                                 Number of queries per second for k8s API (default 15)
       --log.format string                                      Set log format. Allowed values: 'pretty', 'JSON'. If empty, default format is used (default "pretty")
-      --log.level stringArray                                  Set log levels in format <level> or <logger>=<level>. Possible loggers: action, agency, api-server, assertion, backup-operator, chaos-monkey, crd, deployment, deployment-ci, deployment-reconcile, deployment-replication, deployment-resilience, deployment-resources, deployment-storage, deployment-storage-pc, deployment-storage-service, http, inspector, integration-config-v1, integrations, k8s-client, monitor, networking-route-operator, operator, operator-arangojob-handler, operator-v2, operator-v2-event, operator-v2-worker, panics, pod_compare, root, root-event-recorder, server, server-authentication (default [info])
+      --log.level stringArray                                  Set log levels in format <level> or <logger>=<level>. Possible loggers: action, agency, api-server, assertion, backup-operator, chaos-monkey, crd, deployment, deployment-ci, deployment-reconcile, deployment-replication, deployment-resilience, deployment-resources, deployment-storage, deployment-storage-pc, deployment-storage-service, http, inspector, integration-config-v1, integrations, k8s-client, kubernetes-informer, monitor, networking-route-operator, operator, operator-arangojob-handler, operator-v2, operator-v2-event, operator-v2-worker, panics, pod_compare, root, root-event-recorder, server, server-authentication (default [info])
       --log.sampling                                           If true, operator will try to minimize duplication of logging events (default true)
       --memory-limit uint                                      Define memory limit for hard shutdown and the dump of goroutines. Used for testing
       --metrics.excluded-prefixes stringArray                  List of the excluded metrics prefixes

diff --git a/cmd/cmd_ops.go b/cmd/cmd_ops.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,11 +29,15 @@ import (
 
 var (
 	cmdOps = cobra.Command{
-		Use: "arangodb_ops",
+		Use: "arangodb_operator_ops",
 		Run: executeUsage,
 	}
 )
 
+func CommandOps() *cobra.Command {
+	return &cmdOps
+}
+
 func ExecuteOps() int {
 	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 

diff --git a/cmd/integration/init.go b/cmd/integration/init.go
@@ -0,0 +1,60 @@
+//
+// DISCLAIMER
+//
+// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+//
+// 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.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package integration
+
+import (
+	goflag "flag"
+
+	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
+
+	"github.com/arangodb/kube-arangodb/pkg/integrations"
+)
+
+var (
+	cmd = cobra.Command{
+		Use: "arangodb_operator_integration",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cmd.Usage()
+		},
+	}
+)
+
+func init() {
+	if err := integrations.Register(&cmd); err != nil {
+		panic(err.Error())
+	}
+	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
+}
+
+func Command() *cobra.Command {
+	return &cmd
+}
+
+func Execute() int {
+	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
+
+	if err := cmd.Execute(); err != nil {
+		return 1
+	}
+
+	return 0
+}
diff --git a/cmd/main-int/main_int.go b/cmd/main-int/main_int.go
@@ -21,40 +21,11 @@
 package main
 
 import (
-	goflag "flag"
 	"os"
 
-	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
-
-	"github.com/arangodb/kube-arangodb/pkg/integrations"
-)
-
-var (
-	cmd = cobra.Command{
-		Use: &qu
7DF7
ot;arangodb_int",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return cmd.Usage()
-		},
-	}
+	"github.com/arangodb/kube-arangodb/cmd/integration"
 )
 
-func init() {
-	if err := integrations.Register(&cmd); err != nil {
-		panic(err.Error())
-	}
-}
-
-func Execute() int {
-	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
-
-	if err := cmd.Execute(); err != nil {
-		return 1
-	}
-
-	return 0
-}
-
 func main() {
-	os.Exit(Execute())
+	os.Exit(integration.Execute())
 }