started work on pre-stop hook

.github/workflows/go.yml

@@ -5,7 +5,6 @@ name: Go
 
 on:
   push:
-    branches: [ "main" ]
   pull_request:
 
 jobs:

CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.9.0
+
+Initial release.

Dockerfile

@@ -12,22 +12,22 @@ ENV GO111MODULE=on
 # Set destination for COPY
 WORKDIR /build
 
-COPY go.sum go.mod .
+COPY go.sum go.mod ./
 
 RUN go mod download
 
 COPY . .
 
-RUN apk update && apk add --no-cache git && rm -rf /var/cache/apk/*
+RUN apk update && apk add --no-cache git=2.40.1-r0 && rm -rf /var/cache/apk/*
 
 RUN CGO_ENABLED="0" go build -ldflags "-s -w -X 'main.version=${VERSION}' -X 'main.build=${BUILD_SHA}' -X 'main.built=${BUILD_TIME}'" -o proxysql-agent .
 
 # Stage 2
 FROM alpine:3.18.4 as runner
 
-# add mysql-client to apk add when we're ready
+# add mysql-client, curl, jq, etc to apk add when we're ready
 RUN apk update \
-    && apk add --no-cache bash bind-tools \
+    && apk add --no-cache bash=5.2.15-r5 bind-tools=9.18.19-r0 \
     && rm -rf /var/cache/apk/* \
     && addgroup agent \
     && adduser -S agent -u 1000 -G agent

Makefile

@@ -4,15 +4,15 @@ SHELL := /bin/bash
 TARGET := $(shell echo $${PWD\#\#*/})
 
 # These will be provided to the target
-VERSION := 0.1.0
+VERSION := 0.9.0
 BUILD_SHA := `git rev-parse HEAD`
 BUILD_TIME := `date +%FT%T%z`
 
 # Use linker flags to provide version/build settings to the target.
 # If we don't need debugging symbols, add -s and -w to make a smaller binary
-LDFLAGS=-ldflags "-X 'main.Version=$(VERSION)' -X 'main.Build=$(BUILD_SHA)' -X 'main.BuildTime=$(BUILD_TIME)'"
+LDFLAGS=-ldflags "-s -w -X 'main.version=$(VERSION)' -X 'main.build=$(BUILD_SHA)' -X 'main.builddate=$(BUILD_TIME)'"
 
-# go source files, ignore vendor directory
+# go source files
 SRC=$(shell find . -type f -name '*.go')
 
 all: clean lint build

README.md

@@ -43,16 +43,13 @@ N/A, as yet
 
 ### Status - Alpha
 
-This is currently in alpha. Do not use it in production yet.
+This is currently in beta.
 
 ### TODOs
 
 There are some linear tickets, but here's a high level overview of what I have in mind.
 
-- *P1* - Health checks; replace the ruby health probe with this
-  - Use an HTTP endpoint for health checks, because the proxysql container can call the agent container; meaning, if we configure k8s to load `localhost:8080/status` in the proxysql container, and that endpoint is running in the sidecar, it will work just fine
-- *P2* - Replace the pre-stop ruby script with this
-  - same deal as the health check, use the shared FS for this
+- *P2* - Better test coverage
 - *P3* - Leader election; elect one core pod and have it be responsible for managing cluster state
 - *P3* - "plugin" support; we don't necessarily need to add all the Persona specific cases to the main agent, as they won't likely apply to most people
   - "chaosmonkey" feature
@@ -63,17 +60,32 @@ There are some linear tickets, but here's a high level overview of what I have i
   - force a satellite resync (if running in satellite mode)
   - etc
   - Now I'm no sure this is that important; we can just add more commands to the agent, and run said commands from the CLI
-
-
-### MVP Requirements
-
-1. ✅ Cluster management (ie: core and satellite agents) (completed)
-1. 🏗️ Health checks via an HTTP endpoint, specifically for the ProxySQL container (in progress)
-1. Pre-stop hook replacement
+- *P5* - If possible, cleanup the errors that are thrown when the `preStop` hook runs. This might not be possible due to how k8s kills containers, but if it is, these errors need to go away:
+    ```
+    time=2023-11-29T02:32:22.422Z level=INFO msg="Pre-stop called, starting shutdown process" shutdownDelay=120
+    time=2023-11-29T02:32:24.341Z level=INFO msg="Pre-stop commands ran" commands="UPDATE global_variables SET variable_value = 120000 WHERE variable_name in ('mysql-connection_max_age_ms', 'mysql-max_transaction_idle_time', 'mysql-max_transaction_time'); UPDATE global_variables SET variable_value = 1 WHERE variable_name = 'mysql-wait_timeout'; LOAD MYSQL VARIABLES TO RUNTIME; PROXYSQL PAUSE;"
+    time=2023-11-29T02:32:24.343Z level=INFO msg="No connected clients remaining, proceeding with shutdown"
+    [mysql] 2023/11/29 02:32:24 packets.go:37: unexpected EOF
+    time=2023-11-29T02:32:24.348Z level=ERROR msg="KILL command failed" commands="PROXYSQL KILL" error="invalid connection"
+    rpc error: code = Unknown desc = Error: No such container: e3153c34e0ad525c280dd26695b78d917b1cb377a545744bffb9b31ad1c90670%
+    ```
+
+#### MVP Requirements
+
+1. ✅ Cluster management (ie: core and satellite agents)
+1. ✅ Health checks via an HTTP endpoint, specifically for the ProxySQL container
+1. ✅ Pre-stop hook replacement
 
 #### Done
 
 - *P1* - ~~Dump the contents of `stats_mysql_query_digests` to a file on disk; will be used to get the data into snowflake. File format is CSV~~
+- *P1* - ~~Health checks; replace the ruby health probe with this~~
+- *P2* - ~~Replace the pre-stop ruby script with this~~
+
+### Releasing a new version
+
+1. Update version in Makefile (and anywhere that calls `go build`, like pipelines)
+1. Update the CHANGELOG.md with the changes
 
 ### See also
 

go.mod

@@ -10,22 +10,22 @@ require (
 	k8s.io/client-go v0.28.4
 )
 
-require github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-
 require (
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.4.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -39,31 +39,31 @@ require (
 	github.com/sagikazarmark/locafero v0.3.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/stretchr/testify v1.8.4
 	github.com/subosito/gotenv v1.6.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.12.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/DATA-DOG/go-sqlmock.v2 v2.0.0-20180914054222-c19298f520d0
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.28.4 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
+	k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )