Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
.DS_Store
Dockerfile.local
Makefile.local
out/
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ MODULE := github.com/alcounit/browser-controller
APIS_PKG := apis
GROUP := selenosis
BROWSER := browser
BROWSERCONFIG := browserconfig
API_VERSION := v1
BOILERPLATE := hack/boilerplate.go.txt

Expand Down Expand Up @@ -57,7 +58,7 @@ client:
@$(CLIENT_GEN) \
--clientset-name clientset \
--input-base "$(MODULE)/apis" \
--input $(BROWSER)/$(API_VERSION) \
--input $(BROWSER)/$(API_VERSION),$(BROWSERCONFIG)/$(API_VERSION) \
--output-pkg $(PROJECT_PKG) \
--output-dir ./pkg \
--go-header-file $(BOILERPLATE)
Expand All @@ -67,7 +68,7 @@ lister:
--output-pkg $(LISTER_PKG) \
--output-dir ./pkg/listers \
--go-header-file $(BOILERPLATE) \
$(MODULE)/$(APIS_PKG)/$(BROWSER)/$(API_VERSION)
$(MODULE)/$(APIS_PKG)/$(BROWSER)/$(API_VERSION) $(MODULE)/$(APIS_PKG)/$(BROWSERCONFIG)/$(API_VERSION)

informer:
@$(INFORMER_GEN) \
Expand All @@ -76,7 +77,7 @@ informer:
--output-pkg $(INFORMER_PKG) \
--output-dir ./pkg/informers \
--go-header-file $(BOILERPLATE) \
$(MODULE)/$(APIS_PKG)/$(BROWSER)/$(API_VERSION)
$(MODULE)/$(APIS_PKG)/$(BROWSER)/$(API_VERSION) $(MODULE)/$(APIS_PKG)/$(BROWSERCONFIG)/$(API_VERSION)

manifests:
@$(CONTROLLER_GEN) \
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,7 @@ Or combined:
```bash
make deploy
```

## Deployment

Helm chart [selenosis-deploy](https://github.com/alcounit/selenosis-deploy)
2 changes: 1 addition & 1 deletion apis/browser/v1/doc.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +k8s:deepcopy-gen=package
// +groupName=selenosis.io
// +groupName=browser.selenosis.io

package v1
4 changes: 2 additions & 2 deletions apis/browser/v1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

// Package v1 contains API Schema definitions for the selenosis.io v1 API group.
// +kubebuilder:object:generate=true
// +groupName=selenosis.io
// +groupName=browser.selenosis.io
package v1

import (
Expand All @@ -27,7 +27,7 @@ import (

var (
// GroupVersion is group version used to register these objects.
SchemeGroupVersion = schema.GroupVersion{Group: "selenosis.io", Version: "v1"}
SchemeGroupVersion = schema.GroupVersion{Group: "browser.selenosis.io", Version: "v1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
Expand Down
5 changes: 4 additions & 1 deletion apis/browserconfig/v1/browser_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// BrowserConfig is the root CRD type that defines browser configurations and associated pod templates.
// +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:path=browserconfigs,scope=Namespaced
// BrowserConfig is the root CRD type that defines browser configurations and associated pod templates.
type BrowserConfig struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion apis/browserconfig/v1/doc.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +k8s:deepcopy-gen=package
// +groupName=selenosis.io
// +groupName=browserconfig.selenosis.io

package v1
4 changes: 2 additions & 2 deletions apis/browserconfig/v1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

// Package v1 contains API Schema definitions for the selenosis.io v1 API group.
// +kubebuilder:object:generate=true
// +groupName=selenosis.io
// +groupName=browserconfig.selenosis.io
package v1

import (
Expand All @@ -27,7 +27,7 @@ import (

var (
// GroupVersion is group version used to register these objects.
SchemeGroupVersion = schema.GroupVersion{Group: "selenosis.io", Version: "v1"}
SchemeGroupVersion = schema.GroupVersion{Group: "browserconfig.selenosis.io", Version: "v1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
Expand Down
44 changes: 0 additions & 44 deletions config/controller/browser-controller.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
name: browsers.selenosis.io
name: browsers.browser.selenosis.io
spec:
group: selenosis.io
group: browser.selenosis.io
names:
kind: Browser
listKind: BrowserList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
name: browserconfigs.selenosis.io
name: browserconfigs.browserconfig.selenosis.io
spec:
group: selenosis.io
group: browserconfig.selenosis.io
names:
kind: BrowserConfig
listKind: BrowserConfigList
Expand Down
208 changes: 0 additions & 208 deletions config/examples/browser-config-multisidecar.yaml

This file was deleted.

Loading