Skip to content
This repository has been archived by the owner on Dec 17, 2019. It is now read-only.

Mobile app crd #32

Merged
merged 11 commits into from
Aug 3, 2018
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
110 changes: 102 additions & 8 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ required = [
name = "github.com/gorilla/websocket"
version = "1.2.0"

[prune]
go-tests = true
unused-packages = true

[[constraint]]
name = "github.com/operator-framework/operator-sdk"
branch = "master"
# The version rule is used for a specific release and the master branch for in between releases.
branch = "master"
# version = "=v0.0.5"

[[constraint]]
name = "gopkg.in/go-playground/validator.v9"
version = "9.20.2"
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,13 @@ oc process -f mobile-client-service.template.yaml --parameters
```bash
make test
```

## Generate the API definition for the CRD

If you are changing the type definition of (MobileClient)[./pkg/apis/aerogear/v1alpha1/types.go], you should run the following command to regenerate some of the files.

Make sure you have the [operator-sdk](https://github.com/operator-framework/operator-sdk) installed locally, and then run

```
operator-sdk generate k8s
```
25 changes: 16 additions & 9 deletions cmd/api-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ import (
"github.com/aerogear/mobile-client-service/pkg/web"
log "github.com/sirupsen/logrus"

"context"
"github.com/aerogear/mobile-client-service/pkg/stub"
sc "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset"
buildv1 "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
"github.com/operator-framework/operator-sdk/pkg/k8sclient"
"github.com/operator-framework/operator-sdk/pkg/sdk"
"k8s.io/client-go/tools/clientcmd"
)

Expand Down Expand Up @@ -81,16 +83,21 @@ func main() {
}

{
mobileResourceClient, _, err := k8sclient.GetResourceClient("mobile.k8s.io/v1alpha1", "MobileClient", namespace)
if err != nil {
log.Fatalf("Error getting mobile custom resource client: %v", err)
}

mobileResourceLister := mobile.NewMobileResourceLister(mobileResourceClient)
mobileResourceHandler := web.NewMobileResourceHandler(mobileResourceLister)
web.SetMobileClientRoutes(apiGroup, mobileResourceHandler)
mobileClientsRepo := mobile.NewMobileClientRepo(namespace)
mobileClientsHandler := web.NewMobileClientsHandler(mobileClientsRepo, namespace)
web.SetupMoileClientsRoute(apiGroup, mobileClientsHandler)
}

resource := "v1"
kind := "Secret"
resyncPeriod := 5

go func() {
sdk.Watch(resource, kind, namespace, resyncPeriod)
sdk.Handle(stub.NewHandler())
sdk.Run(context.Background())
}()

log.WithFields(log.Fields{"listenAddress": config.ListenAddress}).Info("Starting application")
log.Fatal(http.ListenAndServe(config.ListenAddress, router))
}
Expand Down
3 changes: 3 additions & 0 deletions config/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
apiVersion: aerogear.org/v1alpha1
kind: MobileClient
projectName: mobile-client-service
9 changes: 9 additions & 0 deletions deploy/cr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: "aerogear.org/v1alpha1"
kind: "MobileClient"
metadata:
name: "example"
spec:
clientType: "android"
name: "android-app"
appIdentifier: "test.aerogear.org"

32 changes: 32 additions & 0 deletions deploy/crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: mobileclients.aerogear.org
spec:
group: aerogear.org
version: v1alpha1
scope: Namespaced
names:
plural: mobileclients
singular: mobileclient
kind: MobileClient
shortNames:
- mc
validation:
# openAPIV3Schema is the schema for validating custom objects.
openAPIV3Schema:
properties:
spec:
properties:
clientType:
type: string
pattern: 'cordova|iOS|android|xamarin'
name:
type: string
pattern: '([\w-])'
appIdentifier:
type: string
pattern: '([\w-])'
dmzUrl:
type: string
nullable: true
46 changes: 46 additions & 0 deletions deploy/rbac.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: mobileclient-operator
rules:
- apiGroups:
- aerogear.org
resources:
- "*"
verbs:
- "*"
- apiGroups:
- ""
resources:
- pods
- services
- endpoints
- persistentvolumeclaims
- events
- configmaps
- secrets
verbs:
- "*"
- apiGroups:
- apps
resources:
- deployments
- daemonsets
- replicasets
- statefulsets
verbs:
- "*"

---

kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: default-account-mobileclient-operator
subjects:
- kind: ServiceAccount
name: default
roleRef:
kind: Role
name: mobileclient-operator
apiGroup: rbac.authorization.k8s.io
3 changes: 3 additions & 0 deletions pkg/apis/aerogear/v1alpha1/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// +k8s:deepcopy-gen=package
// +groupName=aerogear.org
package v1alpha1
Loading