Skip to content

Add selenosis specific keys for labels and annotation #4

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
alcounit merged 1 commit into from
Feb 1, 2026
Merged

Add selenosis specific keys for labels and annotation #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions apis/browser/v1/selenosis_keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package v1

var (
SelenosisOptionsAnnotationKey = "selenosis.io/options"
SelenosisOwnerLabelKey = "selenosis.io/owner"
)
8 changes: 3 additions & 5 deletions controllers/browser/browser_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ const (

browserContainerName = "browser"
sidecarContainerName = "seleniferous"

selenosisOptionsAnnotationKey = "selenosis.io/options"
)

type SelenosisOptions struct {
Expand Down Expand Up @@ -808,7 +806,7 @@ func buildBrowserPod(browser *browserv1.Browser, cfg *configv1.BrowserVersionCon
pod.Annotations = map[string]string{}
}
for k, v := range browser.Annotations {
if k == selenosisOptionsAnnotationKey {
if k == browserv1.SelenosisOptionsAnnotationKey {
continue
}
pod.Annotations[k] = v
Expand Down Expand Up @@ -867,14 +865,14 @@ func parseSelenosisOptions(ann map[string]string) (*SelenosisOptions, error) {
if ann == nil {
return nil, nil
}
raw := ann[selenosisOptionsAnnotationKey]
raw := ann[browserv1.SelenosisOptionsAnnotationKey]
if raw == "" {
return nil, nil
}

var opts SelenosisOptions
if err := json.Unmarshal([]byte(raw), &opts); err != nil {
return nil, fmt.Errorf("unmarshal %s: %w", selenosisOptionsAnnotationKey, err)
return nil, fmt.Errorf("unmarshal %s: %w", browserv1.SelenosisOptionsAnnotationKey, err)
}
return &opts, nil
}
Expand Down
10 changes: 5 additions & 5 deletions controllers/browser/browser_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ func TestBuildBrowserPod(t *testing.T) {

func TestParseSelenosisOptionsInvalidJSON(t *testing.T) {
ann := map[string]string{
selenosisOptionsAnnotationKey: "{nope",
browserv1.SelenosisOptionsAnnotationKey: "{nope",
}
_, err := parseSelenosisOptions(ann)
if err == nil {
t.Fatalf("expected error")
}
if !strings.Contains(err.Error(), selenosisOptionsAnnotationKey) {
if !strings.Contains(err.Error(), browserv1.SelenosisOptionsAnnotationKey) {
t.Fatalf("expected error to mention annotation key, got %v", err)
}
}
Expand All @@ -199,7 +199,7 @@ func TestParseSelenosisOptionsEmpty(t *testing.T) {
t.Fatalf("expected nil options for nil annotations")
}

opts, err = parseSelenosisOptions(map[string]string{selenosisOptionsAnnotationKey: ""})
opts, err = parseSelenosisOptions(map[string]string{browserv1.SelenosisOptionsAnnotationKey: ""})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
Expand All @@ -210,7 +210,7 @@ func TestParseSelenosisOptionsEmpty(t *testing.T) {

func TestParseSelenosisOptionsValidJSON(t *testing.T) {
ann := map[string]string{
selenosisOptionsAnnotationKey: `{"labels":{"a":"b"},"containers":{"browser":{"env":{"X":"1"}}}}`,
browserv1.SelenosisOptionsAnnotationKey: `{"labels":{"a":"b"},"containers":{"browser":{"env":{"X":"1"}}}}`,
}
opts, err := parseSelenosisOptions(ann)
if err != nil {
Expand Down Expand Up @@ -378,7 +378,7 @@ func TestHandleMissingPodInvalidSelenosisOptions(t *testing.T) {
Name: "b1",
Namespace: "ns",
Annotations: map[string]string{
selenosisOptionsAnnotationKey: "{bad-json",
browserv1.SelenosisOptionsAnnotationKey: "{bad-json",
},
},
Spec: browserv1.BrowserSpec{
Expand Down