Added Ingressroute Support (#272)

* Added Ingressroute Support * Added Ingressroute Support * Bump anothrNick/github-tag-action from 1.39.0 to 1.52.0 (#270) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.39.0 to 1.52.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](anothrNick/github-tag-action@1.39.0...1.52.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/spf13/viper from 1.12.0 to 1.13.0 (#255) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David J. M. Karlsen <david@davidkarlsen.com> * Bump k8s.io/client-go from 0.25.0 to 0.25.2 (#264) Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.25.0 to 0.25.2. - [Release notes](https://github.com/kubernetes/client-go/releases) - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.25.0...v0.25.2) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David J. M. Karlsen <david@davidkarlsen.com> * [skip-ci] Update artifacts * Bump react-scripts from 3.2.0 to 5.0.1 in /frontend (#239) Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 3.2.0 to 5.0.1. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-3.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts) --- updated-dependencies: - dependency-name: react-scripts dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David J. M. Karlsen <david@davidkarlsen.com> * [skip-ci] Update artifacts * Bump react-redux from 7.1.1 to 8.0.4 in /frontend Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.1 to 8.0.4. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](reduxjs/react-redux@v7.1.1...v8.0.4) --- updated-dependencies: - dependency-name: react-redux dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Bump kind-of from 6.0.2 to 6.0.3 in /frontend (#276) Bumps [kind-of](https://github.com/jonschlinkert/kind-of) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/jonschlinkert/kind-of/releases) - [Changelog](https://github.com/jonschlinkert/kind-of/blob/master/CHANGELOG.md) - [Commits](jonschlinkert/kind-of@6.0.2...6.0.3) --- updated-dependencies: - dependency-name: kind-of dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [skip-ci] Update artifacts * Bump k8s.io/client-go from 0.25.2 to 0.25.3 (#277) Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.25.2 to 0.25.3. - [Release notes](https://github.com/kubernetes/client-go/releases) - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.25.2...v0.25.3) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump acorn from 7.1.0 to 7.4.1 in /frontend (#275) Bumps [acorn](https://github.com/acornjs/acorn) from 7.1.0 to 7.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](acornjs/acorn@7.1.0...7.4.1) --- updated-dependencies: - dependency-name: acorn dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [skip-ci] Update artifacts * Bump axios from 0.27.2 to 1.1.3 in /frontend (#278) Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.1.3. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v0.27.2...v1.1.3) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [skip-ci] Update artifacts * Added Ingressroute Support Added Ingressroute Support * Added Ingressroute Support Added Ingressroute Support * Added Ingressroute Support * Added Ingressroute Support Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Skiepp <skiepp@my-dockerfarm.cloud> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David J. M. Karlsen <david@davidkarlsen.com> Co-authored-by: stakater-user <stakater@gmail.com>
stakater · Oct 18, 2022 · d89df19 · d89df19
1 parent 5def38b
commit d89df19
Show file tree

Hide file tree

Showing 12 changed files with 356 additions and 28 deletions.
diff --git a/deployments/kubernetes/chart/forecastle/crds/forecastleApp.yaml b/deployments/kubernetes/chart/forecastle/crds/forecastleApp.yaml
@@ -61,6 +61,11 @@ spec:
                     properties:
                       name:
                         type: string
+                  ingressRouteRef:
+                    type: object
+                    properties:
+                      name:
+                        type: string
                 type: object
             required:
             - name

diff --git a/deployments/kubernetes/chart/forecastle/templates/rbac.yaml b/deployments/kubernetes/chart/forecastle/templates/rbac.yaml
@@ -21,15 +21,21 @@ metadata:
 {{ include "forecastle.labels.stakater" . | indent 4 }}
 {{ include "forecastle.labels.chart" . | indent 4 }}
 rules:
-- apiGroups: ["", "route.openshift.io", "networking.k8s.io"]
-  resources: ["ingresses", "routes", "namespaces"]
+- apiGroups: [""]
+  resources: ["namespaces"]
   verbs: ["get", "list"]
-- apiGroups:
-  - forecastle.stakater.com
-  resources:
-  - '*'
-  verbs:
-  - '*'
+- apiGroups: ["networking.k8s.io"]
+  resources: ["ingresses"]
+  verbs: ["get", "list"]
+- apiGroups: ["route.openshift.io"]
+  resources: ["routes"]
+  verbs: ["get", "list"]
+- apiGroups: ["traefik.containo.us"]
+  resources: ["ingressroutes"]
+  verbs: ["get", "list"]
+- apiGroups: ["forecastle.stakater.com"]
+  resources: ["*"]
+  verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/deployments/kubernetes/forecastle.yaml b/deployments/kubernetes/forecastle.yaml
@@ -63,6 +63,11 @@ spec:
                     properties:
                       name:
                         type: string
+                  ingressRouteRef:
+                    type: object
+                    properties:
+                      name:
+                        type: string
                 type: object
             required:
             - name
@@ -131,15 +136,21 @@ metadata:
     release: "forecastle"
     heritage: "Helm"
 rules:
-- apiGroups: ["", "route.openshift.io", "networking.k8s.io"]
-  resources: ["ingresses", "routes", "namespaces"]
+- apiGroups: [""]
+  resources: ["namespaces"]
+  verbs: ["get", "list"]
+- apiGroups: ["networking.k8s.io"]
+  resources: ["ingresses"]
+  verbs: ["get", "list"]
+- apiGroups: ["route.openshift.io"]
+  resources: ["routes"]
+  verbs: ["get", "list"]
+- apiGroups: ["traefik.containo.us"]
+  resources: ["ingressroutes"]
   verbs: ["get", "list"]
-- apiGroups:
-  - forecastle.stakater.com
-  resources:
-  - '*'
-  verbs:
-  - '*'
+- apiGroups: ["forecastle.stakater.com"]
+  resources: ["*"]
+  verbs: ["*"]
 ---
 # Source: forecastle/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/deployments/kubernetes/manifests/forecastleApp.yaml b/deployments/kubernetes/manifests/forecastleApp.yaml
@@ -63,6 +63,11 @@ spec:
                     properties:
                       name:
                         type: string
+                  ingressRouteRef:
+                    type: object
+                    properties:
+                      name:
+                        type: string
                 type: object
             required:
             - name

diff --git a/deployments/kubernetes/manifests/rbac.yaml b/deployments/kubernetes/manifests/rbac.yaml
@@ -27,15 +27,21 @@ metadata:
     release: "forecastle"
     heritage: "Helm"
 rules:
-- apiGroups: ["", "route.openshift.io", "networking.k8s.io"]
-  resources: ["ingresses", "routes", "namespaces"]
+- apiGroups: [""]
+  resources: ["namespaces"]
   verbs: ["get", "list"]
-- apiGroups:
-  - forecastle.stakater.com
-  resources:
-  - '*'
-  verbs:
-  - '*'
+- apiGroups: ["networking.k8s.io"]
+  resources: ["ingresses"]
+  verbs: ["get", "list"]
+- apiGroups: ["route.openshift.io"]
+  resources: ["routes"]
+  verbs: ["get", "list"]
+- apiGroups: ["traefik.containo.us"]
+  resources: ["ingressroutes"]
+  verbs: ["get", "list"]
+- apiGroups: ["forecastle.stakater.com"]
+  resources: ["*"]
+  verbs: ["*"]
 ---
 # Source: forecastle/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/go.mod b/go.mod
@@ -14,15 +14,18 @@ require (
 	k8s.io/api v0.25.3
 	k8s.io/apimachinery v0.25.3
 	k8s.io/client-go v0.25.3
+	mvdan.cc/xurls/v2 v2.4.0
 )
 
 require (
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/go-acme/lego/v4 v4.7.0 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -33,21 +36,23 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/karrick/godirwalk v1.16.1 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/markbates/errx v1.1.0 // indirect
 	github.com/markbates/oncer v1.0.0 // indirect
 	github.com/markbates/safe v1.0.1 // indirect
+	github.com/miekg/dns v1.1.47 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -56,18 +61,26 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/traefik/paerser v0.1.9 // indirect
+	github.com/traefik/traefik/v2 v2.9.1 // indirect
+	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.21.3 // indirect
 	k8s.io/klog/v2 v2.70.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect