Skip to content

Commit

Permalink
Merge branch 'main' into fix-ca-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
sharnoff committed Nov 19, 2024
2 parents f835226 + 3fab71f commit cf74ac0
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 145 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PG16_DISK_TEST_IMG ?= pg16-disk-test:dev
GOARCH ?= $(shell go env GOARCH)
GOOS ?= $(shell go env GOOS)

# The target architecture for linux kernel. Possible values: amd64 or arm64.
# The target architecture for linux kernel. Possible values: amd64 or arm64.
# Any other supported by linux kernel architecture could be added by introducing new build step into neonvm/hack/kernel/Dockerfile.kernel-builder
KERNEL_TARGET_ARCH ?= amd64

Expand Down Expand Up @@ -141,7 +141,7 @@ build: vet bin/vm-builder ## Build all neonvm binaries.

.PHONY: bin/vm-builder
bin/vm-builder: ## Build vm-builder binary.
GOOS=linux CGO_ENABLED=0 go build -o bin/vm-builder -ldflags "-X main.Version=${GIT_INFO} -X main.NeonvmDaemonImage=${IMG_DAEMON}" vm-builder/main.go
GOOS=linux CGO_ENABLED=0 go build -o bin/vm-builder -ldflags "-X main.Version=${GIT_INFO} -X main.NeonvmDaemonImage=${IMG_DAEMON}" vm-builder/main.go
.PHONY: run
run: vet ## Run a controller from your host.
go run ./neonvm/main.go
Expand Down
10 changes: 10 additions & 0 deletions autoscale-scheduler/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,13 @@ spec:
- name: plugin-config-volume
configMap:
name: scheduler-plugin-config

tolerations:
# Add explicit (short) tolerations for node failure, because otherwise the default of 5m
# will be used, which is unacceptably long for us.
- key: node.kubernetes.io/not-ready
tolerationSeconds: 30
effect: NoExecute
- key: node.kubernetes.io/unreachable
tolerationSeconds: 30
effect: NoExecute
135 changes: 0 additions & 135 deletions pkg/api/VERSIONING.md

This file was deleted.

10 changes: 4 additions & 6 deletions pkg/api/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import (
// repository containing this code. Names follow semver, although this does not necessarily
// guarantee support - for example, the plugin may only support a single version, even though others
// may appear to be semver-compatible.
//
// Version compatibility is documented in the neighboring file VERSIONING.md.
type PluginProtoVersion uint32

const (
Expand Down Expand Up @@ -174,15 +172,17 @@ func (v PluginProtoVersion) IncludesExtendedMetrics() bool {
return v < PluginProtoV5_0
}

// AgentRequest is the type of message sent from an autoscaler-agent to the scheduler plugin
// AgentRequest is the type of message sent from an autoscaler-agent to the scheduler plugin on
// behalf of a Pod on the agent's node.
//
// All AgentRequests expect a PluginResponse.
type AgentRequest struct {
// ProtoVersion is the version of the protocol that the autoscaler-agent is expecting to use
//
// If the scheduler does not support this version, then it will respond with a 400 status.
ProtoVersion PluginProtoVersion `json:"protoVersion"`
// Pod is the namespaced name of the pod making the request
// Pod is the namespaced name of the Pod that the autoscaler-agent is making the request on
// behalf of.
Pod util.NamespacedName `json:"pod"`
// ComputeUnit gives the value of the agent's configured compute unit to use for the VM.
//
Expand Down Expand Up @@ -595,8 +595,6 @@ func SerializeMonitorMessage(content any, id uint64) ([]byte, error) {
// Each version of the agent<->monitor protocol is named independently from releases of the
// repository containing this code. Names follow semver, although this does not necessarily
// guarantee support - for example, the monitor may only support versions above v1.1.
//
// Version compatibility is documented in the neighboring file VERSIONING.md.
type MonitorProtoVersion uint32

const (
Expand Down
2 changes: 0 additions & 2 deletions pkg/plugin/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ const (
)

// The scheduler plugin currently supports v3.0 to v5.0 of the agent<->scheduler plugin protocol.
//
// If you update either of these values, make sure to also update VERSIONING.md.
const (
MinPluginProtocolVersion api.PluginProtoVersion = api.PluginProtoV3_0
MaxPluginProtocolVersion api.PluginProtoVersion = api.PluginProtoV5_0
Expand Down

0 comments on commit cf74ac0

Please sign in to comment.