Merge branch 'main' of github.com:DataDog/datadog-operator into lenai…

…c/CONTINT-4412
DataDog · Oct 23, 2024 · 7770e29 · 7770e29
2 parents 1ccaf76 + eb50a22
commit 7770e29
Show file tree

Hide file tree

Showing 32 changed files with 2,450 additions and 2,002 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: Build
-
+env:
+  GO_VERSION: 1.22.7
 on:
   push:
-
 jobs:
   build-linux-binary:
     runs-on: ubuntu-latest
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
       - name: Build
         uses: goreleaser/goreleaser-action@v3
         with:
@@ -54,7 +54,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
       - name: Build
         uses: goreleaser/goreleaser-action@v3
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,32 +2,33 @@ name: validation
 on: [push, pull_request]
 env:
   PROJECTNAME: "datadog-operator"
+  GO_VERSION: 1.22.7
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.22
-      id: go
-    - name: install required packages
-      uses: mstksg/get-package@v1
-      with:
-        apt-get: mercurial jq build-essential
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-    - name: install tools
-      run: |
-        make install-tools
-    - name: run build
-      run: |
-        make manager
-    - name: run unit tests and E2E tests (fake cluster)
-      run: |
-        make test
-    - uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: cover.out,cover_integration_v1.out,cover_integration_v2.out
-        flags: unittests
+      - name: Set up Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+      - name: install required packages
+        uses: mstksg/get-package@v1
+        with:
+          apt-get: mercurial jq build-essential
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+      - name: install tools
+        run: |
+          make install-tools
+      - name: run build
+        run: |
+          make manager
+      - name: run unit tests and E2E tests (fake cluster)
+        run: |
+          make test
+      - uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: cover.out,cover_integration_v1.out,cover_integration_v2.out
+          flags: unittests
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,13 +1,13 @@
 name: Release
-
 on:
   push:
     branches:
       - "v[0-9]+.[0-9]+"
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
-
+env:
+  GO_VERSION: 1.22.7
 jobs:
   build-linux-binary:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -25,14 +25,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
       - name: Get Latest Release
         id: latest_version
         uses: pozetroninc/github-action-get-latest-release@master
         with:
-            owner: ${{ github.repository_owner }}
-            repo: datadog-operator
-            excludes: prerelease, draft
+          owner: ${{ github.repository_owner }}
+          repo: datadog-operator
+          excludes: prerelease, draft
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:
@@ -61,14 +61,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
       - name: Get Latest Release
         id: latest_version
         uses: pozetroninc/github-action-get-latest-release@master
         with:
-            owner: ${{ github.repository_owner }}
-            repo: datadog-operator
-            excludes: prerelease, draft
+          owner: ${{ github.repository_owner }}
+          repo: datadog-operator
+          excludes: prerelease, draft
       - name: Build
         uses: goreleaser/goreleaser-action@v3
         with:
@@ -95,14 +95,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
       - name: Get Latest Release
         id: latest_version
         uses: pozetroninc/github-action-get-latest-release@master
         with:
-            owner: ${{ github.repository_owner }}
-            repo: datadog-operator
-            excludes: prerelease, draft
+          owner: ${{ github.repository_owner }}
+          repo: datadog-operator
+          excludes: prerelease, draft
       - name: Build
         uses: goreleaser/goreleaser-action@v3
         with:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ stages:
 
 build:
   stage: build
-  tags: ["runner:main", "size:large"]
+  tags: ["arch:amd64"]
   before_script:
     - mkdir -p .cache
     - make install-tools
@@ -87,7 +87,7 @@ build:
 
 unit_tests:
   stage: test
-  tags: ["runner:main", "size:large"]
+  tags: ["arch:amd64"]
   rules:
     - if: '$DDR == "true"'
       when: never
@@ -98,9 +98,19 @@ unit_tests:
   script:
     - make test
 
+check-golang-version:
+  stage: test
+  tags: ["arch:amd64"]
+  before_script:
+    - mkdir -p .cache
+    - make install-tools
+  script:
+    - make update-golang
+    - git diff --exit-code
+
 generate_code:
   stage: test
-  tags: ["runner:main", "size:large"]
+  tags: ["arch:amd64"]
   rules:
     - if: '$DDR == "true"'
       when: never
@@ -462,9 +472,10 @@ publish_community_operators:
     # Note: skopeo apt package is only available in for ubuntu 20.10+
     # https://github.com/containers/skopeo/blob/main/install.md#ubuntu
     # TODO: use apt-get when gitlab runner image base is updated to use ubuntu 20.10+
-    - git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo
-    - cd $GOPATH/src/github.com/containers/skopeo && DISABLE_DOCS=1 make bin/skopeo
+    - git clone --single-branch -b $SKOPEO_VERSION https://github.com/containers/skopeo /tmp/skopeo
+    - cd /tmp/skopeo && DISABLE_DOCS=1 make bin/skopeo
     - DISABLE_DOCS=1 make install
+    - skopeo --version
     # Set up redhat registry access to generate bundle-redhat
     - mkdir ~/.redhat
     - aws ssm get-parameter --region us-east-1 --name
@@ -479,7 +490,8 @@ publish_community_operators:
     - gh auth setup-git
     # create pull request for each marketplace repo
     - make publish-community-bundles
-
+  variables:
+    SKOPEO_VERSION: release-1.16
 
 # On success, this will cause Conductor to trigger a Deployment to nightly clusters in SDP
 publish_nightly_workflow:

diff --git a/Makefile b/Makefile
@@ -282,7 +282,7 @@ catalog-push: ## Push a catalog image.
 
 ##@ Datadog Custom part
 .PHONY: install-tools
-install-tools: bin/$(PLATFORM)/golangci-lint bin/$(PLATFORM)/operator-sdk bin/$(PLATFORM)/yq bin/$(PLATFORM)/kubebuilder bin/$(PLATFORM)/kubebuilder-tools bin/$(PLATFORM)/go-licenses bin/$(PLATFORM)/openapi-gen
+install-tools: bin/$(PLATFORM)/golangci-lint bin/$(PLATFORM)/operator-sdk bin/$(PLATFORM)/yq bin/$(PLATFORM)/jq bin/$(PLATFORM)/kubebuilder bin/$(PLATFORM)/kubebuilder-tools bin/$(PLATFORM)/go-licenses bin/$(PLATFORM)/openapi-gen
 
 .PHONY: generate-openapi
 generate-openapi: bin/$(PLATFORM)/openapi-gen
@@ -314,6 +314,11 @@ licenses: bin/$(PLATFORM)/go-licenses
 verify-licenses: bin/$(PLATFORM)/go-licenses ## Verify licenses
 	hack/verify-licenses.sh
 
+# Update the golang version in different repository files from the version present in go.mod file
+.PHONY: update-golang
+update-golang:
+	hack/update-golang.sh
+
 .PHONY: tidy
 tidy: ## Run go tidy
 	go mod tidy -v
@@ -332,6 +337,9 @@ publish-community-bundles: ## Publish bundles to community repositories
 bin/$(PLATFORM)/yq: Makefile
 	hack/install-yq.sh v4.31.2
 
+bin/$(PLATFORM)/jq: Makefile
+	hack/install-jq.sh 1.7.1
+
 bin/$(PLATFORM)/golangci-lint: Makefile
 	hack/golangci-lint.sh -b "bin/$(PLATFORM)" v1.61.0
 

diff --git a/api/datadoghq/v2alpha1/test/builder.go b/api/datadoghq/v2alpha1/test/builder.go
@@ -22,6 +22,7 @@ type DatadogAgentBuilder struct {
 // NewDatadogAgentBuilder creates DatadogAgent and initializes Global, Features, Override properties
 func NewDatadogAgentBuilder() *DatadogAgentBuilder {
 	dda := &v2alpha1.DatadogAgent{
+		ObjectMeta: metav1.ObjectMeta{},
 		Spec: v2alpha1.DatadogAgentSpec{
 			Global:   &v2alpha1.GlobalConfig{},
 			Features: &v2alpha1.DatadogFeatures{},
@@ -71,6 +72,11 @@ func (builder *DatadogAgentBuilder) WithName(name string) *DatadogAgentBuilder {
 	return builder
 }
 
+func (builder *DatadogAgentBuilder) WithAnnotations(annotations map[string]string) *DatadogAgentBuilder {
+	builder.datadogAgent.ObjectMeta.Annotations = annotations
+	return builder
+}
+
 // Global environment variable
 func (builder *DatadogAgentBuilder) WithEnvVars(envs []corev1.EnvVar) *DatadogAgentBuilder {
 	builder.datadogAgent.Spec.Global.Env = envs

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -2,7 +2,7 @@ resources:
 - manager.yaml
 images:
 - name: controller
-  newName: fannyatdd/operator
-  newTag: saa
+  newName: gcr.io/datadoghq/operator
+  newTag: 1.9.0
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/docs/how-to-contribute.md b/docs/how-to-contribute.md
@@ -1,6 +1,6 @@
 # How to contribute
 
-# Testing the Operator for development
+## Testing the Operator for development
 
 The recommended way to test the Operator is by creating a [kind](https://kind.sigs.k8s.io/) cluster.
 
@@ -76,6 +76,14 @@ kubectl -n $KUBE_NAMESPACE  apply -f examples/datadogagent/datadog-agent-minimum
 
 The Operator should start deploying the `agent` and `cluster-agent`.
 
+## Golang version update
+
+The Go version is defined in several files. To ensure all relevant files are updated, it is recommended to use the script `make update-golang`:
+
+1. Update the Go version in the `go.work` file.
+2. Run the command `make update-golang`, which patches all files that contain the Go version.
+
+If the golang version is used in a new file (for example in a new `Dockefile`) the script `hack/update-golang.sh` needs to be updated to handle this new file in the golang version update process.
 
 ## Tests