Merge remote-tracking branch 'origin/master' into casey-fv-vxlan-borrow

Author: caseydavenport

.semaphore/semaphore-scheduled-builds.yml

@@ -129,7 +129,7 @@
     agent:
       machine:
         type: f1-standard-4
-        os_image: ubuntu2004
+        os_image: ubuntu2204
     prologue:
       commands:
         - cd felix

.semaphore/semaphore.yml

@@ -49,12 +49,18 @@ check-dockerfiles:
 check-language:
 	./hack/check-language.sh
 
+protobuf:
+	$(MAKE) -C app-policy protobuf
+	$(MAKE) -C cni-plugin protobuf
+	$(MAKE) -C felix protobuf
+	$(MAKE) -C pod2daemon protobuf
+
 generate:
 	$(MAKE) gen-semaphore-yaml
+	$(MAKE) protobuf
 	$(MAKE) -C api gen-files
 	$(MAKE) -C libcalico-go gen-files
 	$(MAKE) -C felix gen-files
-	$(MAKE) -C app-policy protobuf
 	$(MAKE) gen-manifests
 
 gen-manifests: bin/helm

.semaphore/semaphore.yml.d/blocks/20-felix.yml

@@ -379,7 +379,7 @@ type FelixConfigurationSpec struct {
 	// file reporting is disabled if field is left empty.
 	//
 	// Chosen directory should match the directory used by the CNI plugin for PodStartupDelay.
-	// [Default: ""]
+	// [Default: /var/run/calico]
 	EndpointStatusPathPrefix string `json:"endpointStatusPathPrefix,omitempty"`
 
 	// IptablesMarkMask is the mask that Felix selects its IPTables Mark bits from. Should be a 32 bit hexadecimal

Makefile

@@ -110,6 +110,11 @@ $(WINDOWS_BIN)/calico.exe: $(SRC_FILES)
 $(WINDOWS_BIN)/calico-ipam.exe: $(WINDOWS_BIN)/calico.exe
 	cp "$<" "$@"
 
+protobuf pkg/dataplane/grpc/proto/cnibackend.pb.go: pkg/dataplane/grpc/proto/cnibackend.proto
+	$(DOCKER_RUN) -v $(CURDIR)/pkg/dataplane/grpc/proto:/proto:rw \
+		$(CALICO_BUILD) sh -c 'protoc --proto_path=/proto --go_out=/proto --go-grpc_out=/ --go_opt=paths=source_relative cnibackend.proto'
+	$(MAKE) fix-changed
+
 # NOTE: WINDOWS_IMAGE_REQS must be defined with the requirements to build the windows
 # image. These must be added as reqs to 'image-windows' (originally defined in
 # lib.Makefile) on the specific package Makefile otherwise they are not correctly