Skip to content

add AppProtect version to pod label #4759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 8, 2023
Merged

add AppProtect version to pod label #4759

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddcffd6
add AppProtect version to pod label
pdabelf5 Dec 6, 2023
7f91d89
include version for AppProtect Dos
pdabelf5 Dec 6, 2023
e69798c
simplify file open error logic
pdabelf5 Dec 7, 2023
a158afb
remove DOS check
pdabelf5 Dec 7, 2023
d06a4fb
reword AppProtect fail message
pdabelf5 Dec 8, 2023
b607182
Merge branch 'main' into app-protect-version
pdabelf5 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions cmd/nginx-ingress/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ import (
var version string

const (
nginxVersionLabel = "app.nginx.org/version"
versionLabel = "app.kubernetes.io/version"
nginxVersionLabel = "app.nginx.org/version"
versionLabel = "app.kubernetes.io/version"
appProtectVersionLabel = "appprotect.f5.com/version"
appProtectVersionPath = "/opt/app_protect/VERSION"
)

func main() {
Expand All @@ -71,7 +73,12 @@ func main() {

nginxVersion := getNginxVersionInfo(nginxManager)

updateSelfWithVersionInfo(kubeClient, version, nginxVersion)
var appProtectVersion string
if *appProtect {
appProtectVersion = getAppProtectVersionInfo()
}

updateSelfWithVersionInfo(kubeClient, version, nginxVersion, appProtectVersion)

templateExecutor, templateExecutorV2 := createTemplateExecutors()

Expand Down Expand Up @@ -402,6 +409,16 @@ func getNginxVersionInfo(nginxManager nginx.Manager) string {
return nginxVersion
}

func getAppProtectVersionInfo() string {
v, err := os.ReadFile(appProtectVersionPath)
if err != nil {
glog.Fatalf("Cannot detect the AppProtect version, %s", err.Error())
}
version := strings.TrimSpace(string(v))
glog.Infof("Using AppProtect Version %s", version)
return version
}

func startApAgentsAndPlugins(nginxManager nginx.Manager) (chan error, chan error) {
var aPPluginDone chan error

Expand Down Expand Up @@ -766,7 +783,7 @@ func processConfigMaps(kubeClient *kubernetes.Clientset, cfgParams *configs.Conf
return cfgParams
}

func updateSelfWithVersionInfo(kubeClient *kubernetes.Clientset, version string, nginxVersion string) {
func updateSelfWithVersionInfo(kubeClient *kubernetes.Clientset, version string, nginxVersion string, appProtectVersion string) {
pod, err := kubeClient.CoreV1().Pods(os.Getenv("POD_NAMESPACE")).Get(context.TODO(), os.Getenv("POD_NAME"), meta_v1.GetOptions{})
if err != nil {
glog.Errorf("Error getting pod: %v", err)
Expand All @@ -783,6 +800,9 @@ func updateSelfWithVersionInfo(kubeClient *kubernetes.Clientset, version string,
replacer := strings.NewReplacer(" ", "-", "(", "", ")", "")
nginxVer = replacer.Replace(nginxVer)
labels[nginxVersionLabel] = nginxVer
if appProtectVersion != "" {
labels[appProtectVersionLabel] = appProtectVersion
}
labels[versionLabel] = strings.TrimPrefix(version, "v")
newPod.ObjectMeta.Labels = labels

Expand Down