Merge pull request #10 from msherif1234/fix_kind

run kind targets on the new repo
bpfman · May 31, 2024 · 8abeb40 · 8abeb40
2 parents 8c60b32 + eb341c4
commit 8abeb40
Show file tree

Hide file tree

Showing 600 changed files with 55,749 additions and 20,355 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -37,3 +37,61 @@ jobs:
         fail_ci_if_error: true
         verbose: true   
 
+  kubernetes-integration-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: ['1.21']
+    env:
+      BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
+      BPFMAN_OPERATOR_IMG: quay.io/bpfman/bpfman-operator:int-test
+      XDP_PASS_PRIVATE_IMAGE_CREDS: ${{ secrets.XDP_PASS_PRIVATE_IMAGE_CREDS }}
+    steps:
+      - name: Check disk space
+        run: df -h
+
+      - name: Free up space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo rm -rf /usr/local/lib/android
+
+      - name: Check disk space again
+        run: df -h
+
+      - name: set up go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: cache go modules
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-build-codegen-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-build-codegen-
+      - name: checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: build images
+        run: make build-images
+
+      - name: run integration tests
+        run: make test-integration
+
+      - name: Check disk space
+        run: df -h
+
+      ## Upload diagnostics if integration test step failed.
+      - name: upload diagnostics
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: kubernetes-integration-test-diag
+          path: /tmp/ktf-diag*
+          if-no-files-found: ignore
diff --git a/Containerfile.bpfman-agent b/Containerfile.bpfman-agent
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as bpfman-agent-build
+FROM golang:1.22 as bpfman-agent-build
 ARG TARGETOS
 ARG TARGETARCH
 

diff --git a/Containerfile.bpfman-operator b/Containerfile.bpfman-operator
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as bpfman-operator-build
+FROM golang:1.22 as bpfman-operator-build
 ARG TARGETOS
 ARG TARGETARCH
 

diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ KIND_CLUSTER_NAME ?= bpfman-deployment
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.25.0
-K8S_CODEGEN_VERSION = v0.25.0
+K8S_CODEGEN_VERSION = v0.30.1
 
 .DEFAULT_GOAL := help
 
@@ -197,8 +197,9 @@ generate: manifests generate-register generate-deepcopy generate-typed-clients g
 .PHONY: generate-register
 generate-register: register-gen ## Generate register code see all `zz_generated.register.go` files.
 	$(REGISTER_GEN) \
-		--input-dirs "${PKG}/apis/v1alpha1" \
-		--output-package "${PKG}/apis/" \
+		"${PKG}/apis/v1alpha1" \
+		--output-file zz_generated.register.go \
+		--go-header-file ./hack/boilerplate.go.txt \
 		${COMMON_FLAGS}
 
 .PHONY: generate-deepcopy
@@ -208,28 +209,29 @@ generate-deepcopy: ## Generate code containing DeepCopy, DeepCopyInto, and DeepC
 .PHONY: generate-typed-clients
 generate-typed-clients: client-gen ## Generate typed client code
 	$(CLIENT_GEN) \
-		--clientset-name "versioned" \
+		--clientset-name "clientset" \
 		--input-base "" \
 		--input "${PKG}/apis/v1alpha1" \
-		--output-package "${PKG}/pkg/client/clientset" \
+		--output-pkg "${PKG}/pkg/client" \
+		--output-dir "./pkg/client" \
 		${COMMON_FLAGS}
 
 
 .PHONY: generate-typed-listers
 generate-typed-listers: lister-gen ## Generate typed listers code
-	$(LISTER_GEN) \
-		--input-dirs "${PKG}/apis/v1alpha1" \
-		--output-package "${PKG}/pkg/client/listers" \
+	$(LISTER_GEN) "${PKG}/apis/v1alpha1" \
+		--output-pkg "${PKG}/pkg/client" \
+		--output-dir "./pkg/client" \
 		${COMMON_FLAGS}
 
 
 .PHONY: generate-typed-informers
 generate-typed-informers: informer-gen ## Generate typed informers code
-	$(INFORMER_GEN) \
-		--input-dirs "${PKG}/apis/v1alpha1" \
-		--versioned-clientset-package "${PKG}/pkg/client/clientset/versioned" \
-		--listers-package "${PKG}/pkg/client/listers" \
-		--output-package "${PKG}/pkg/client/informers" \
+	$(INFORMER_GEN) "${PKG}/apis/v1alpha1" \
+		--versioned-clientset-package "${PKG}/pkg/client/clientset" \
+		--listers-package "${PKG}/pkg/client" \
+		--output-pkg "${PKG}/pkg/client" \
+		--output-dir "./pkg/client" \
 		${COMMON_FLAGS}
 
 .PHONY: vendors
@@ -302,14 +304,13 @@ build-images: ## Build bpfman, bpfman-agent, and bpfman-operator images.
 	docker build -t ${BPFMAN_AGENT_IMG} -f Containerfile.bpfman-agent ./
 
 .PHONY: push-images
-push-images: ## Push bpfman, bpfman-agent, bpfman-operator images.
+push-images: ## Push bpfman-agent, bpfman-operator images.
 	docker push ${BPFMAN_OPERATOR_IMG}
 	docker push ${BPFMAN_AGENT_IMG}
-	docker push ${BPFMAN_IMG}
 
 .PHONY: load-images-kind
-load-images-kind: ## Load bpfman, bpfman-agent, and bpfman-operator images into the running local kind devel cluster.
-	kind load docker-image  ${BPFMAN_IMG} ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG} --name ${KIND_CLUSTER_NAME}
+load-images-kind: ## Load bpfman-agent, and bpfman-operator images into the running local kind devel cluster.
+	kind load docker-image ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG} --name ${KIND_CLUSTER_NAME}
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.
@@ -361,6 +362,10 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 setup-kind: ## Setup Kind cluster
 	kind delete cluster --name ${KIND_CLUSTER_NAME} && kind create cluster --config hack/kind-config.yaml --name ${KIND_CLUSTER_NAME}
 
+.PHONY: destroy-kind
+destroy-kind: ## Destroy Kind cluster
+	kind delete cluster --name ${KIND_CLUSTER_NAME}
+
 ## Default deploy target is KIND based with its CSI driver initialized.
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy bpfman-operator to the K8s cluster specified in ~/.kube/config with the csi driver initialized.

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/v1alpha1/zz_generated.register.go b/apis/v1alpha1/zz_generated.register.go
diff --git a/cmd/bpfman-agent/main.go b/cmd/bpfman-agent/main.go
@@ -52,7 +52,7 @@ var (
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(bpfmaniov1alpha1.AddToScheme(scheme))
+	utilruntime.Must(bpfmaniov1alpha1.Install(scheme))
 	utilruntime.Must(v1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }

diff --git a/cmd/bpfman-operator/main.go b/cmd/bpfman-operator/main.go
@@ -45,7 +45,7 @@ var (
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(bpfmaniov1alpha1.AddToScheme(scheme))
+	utilruntime.Must(bpfmaniov1alpha1.Install(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

diff --git a/config/crd/bases/bpfman.io_fentryprograms.yaml b/config/crd/bases/bpfman.io_fentryprograms.yaml
@@ -149,11 +149,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -196,11 +198,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/bpfman.io_fexitprograms.yaml b/config/crd/bases/bpfman.io_fexitprograms.yaml
@@ -149,11 +149,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -196,11 +198,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/bpfman.io_kprobeprograms.yaml b/config/crd/bases/bpfman.io_kprobeprograms.yaml
@@ -157,11 +157,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -204,11 +206,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/bpfman.io_tcprograms.yaml b/config/crd/bases/bpfman.io_tcprograms.yaml
@@ -183,11 +183,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -230,11 +232,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/bpfman.io_tracepointprograms.yaml b/config/crd/bases/bpfman.io_tracepointprograms.yaml
@@ -146,11 +146,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -200,11 +202,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/bpfman.io_uprobeprograms.yaml b/config/crd/bases/bpfman.io_uprobeprograms.yaml
@@ -170,11 +170,13 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           required:
                           - key
                           - operator
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       matchLabels:
                         additionalProperties:
                           type: string
@@ -234,11 +236,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -281,11 +285,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string