diff --git a/custom/deploy.yaml b/custom/deploy.yaml deleted file mode 100644 index 7becbb8..0000000 --- a/custom/deploy.yaml +++ /dev/null @@ -1,36 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: traefik-custom-controller - labels: - app: traefik-custom-controller - namespace: kube-system -spec: - replicas: 1 - selector: - matchLabels: - app: traefik-custom-controller - template: - metadata: - labels: - app: traefik-custom-controller - spec: - serviceAccountName: traefik-custom-controller - containers: - - name: traefik - image: traefik:v2.2 - args: - - --log.level=DEBUG - - --api - - --api.insecure - - --entrypoints.web.address=:9080 - - --entrypoints.websecure.address=:9443 - - --entrypoints.websecure.http.tls=true - - --providers.kubernetescrd - ports: - - name: web - containerPort: 9080 - - name: websecure - containerPort: 9443 - - name: admin - containerPort: 8080 \ No newline at end of file diff --git a/custom/service.yaml b/custom/service.yaml deleted file mode 100644 index a931140..0000000 --- a/custom/service.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: traefik-custom-controller - namespace: kube-system -spec: - type: LoadBalancer - selector: - app: traefik-custom-controller - ports: - - protocol: TCP - port: 9080 - name: web - targetPort: 9080 - - protocol: TCP - port: 9443 - name: websecure - targetPort: 9443 - - protocol: TCP - port: 8080 - name: admin - targetPort: 8080 \ No newline at end of file diff --git a/k8s/clusterrole.yaml b/k8s/clusterrole.yaml deleted file mode 100644 index 73ed08a..0000000 --- a/k8s/clusterrole.yaml +++ /dev/null @@ -1,29 +0,0 @@ -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 -metadata: - name: traefik-external -rules: - - apiGroups: - - "" - resources: - - services - - endpoints - - secrets - verbs: - - get - - list - - watch - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - get - - list - - watch - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update \ No newline at end of file diff --git a/k8s/clusterrolebinding.yaml b/k8s/clusterrolebinding.yaml deleted file mode 100644 index bd12ab5..0000000 --- a/k8s/clusterrolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 -metadata: - name: traefik-external -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: traefik-external -subjects: -- kind: ServiceAccount - name: traefik-external - namespace: kube-system diff --git a/k8s/deploy.yaml b/k8s/deploy.yaml index e378dca..7becbb8 100644 --- a/k8s/deploy.yaml +++ b/k8s/deploy.yaml @@ -1,44 +1,36 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: traefik-external - namespace: kube-system + name: traefik-custom-controller labels: - k8s-app: traefik-external + app: traefik-custom-controller + namespace: kube-system spec: replicas: 1 selector: matchLabels: - k8s-app: traefik-external + app: traefik-custom-controller template: metadata: labels: - k8s-app: traefik-external - name: traefik-external + app: traefik-custom-controller spec: - serviceAccountName: traefik-external + serviceAccountName: traefik-custom-controller containers: - - image: traefik:v2.2.0 - name: traefik-external - ports: - - name: http - containerPort: 9080 - - name: https - containerPort: 9443 - resources: - limits: - memory: "2Gi" - cpu: "2" - requests: - memory: "1Mi" - cpu: "1m" - args: - - --log.level=DEBUG - - --api - - --api.insecure - - --entrypoints.web.Address=:9080 - - --entrypoints.websecure.Address=:9443 - - --entrypoints.websecure.http.tls=true - - --providers.kubernetesingress - - --providers.kubernetesingress.ingressclass=traefik-external - - --providers.kubernetesingress.ingressendpoint.ip=3.14.3.100 \ No newline at end of file + - name: traefik + image: traefik:v2.2 + args: + - --log.level=DEBUG + - --api + - --api.insecure + - --entrypoints.web.address=:9080 + - --entrypoints.websecure.address=:9443 + - --entrypoints.websecure.http.tls=true + - --providers.kubernetescrd + ports: + - name: web + containerPort: 9080 + - name: websecure + containerPort: 9443 + - name: admin + containerPort: 8080 \ No newline at end of file diff --git a/custom/rbac.yaml b/k8s/rbac.yaml similarity index 100% rename from custom/rbac.yaml rename to k8s/rbac.yaml diff --git a/custom/resourcedefinition.yaml b/k8s/resourcedefinition.yaml similarity index 100% rename from custom/resourcedefinition.yaml rename to k8s/resourcedefinition.yaml diff --git a/k8s/service.yaml b/k8s/service.yaml index 50dec0a..0aed03d 100644 --- a/k8s/service.yaml +++ b/k8s/service.yaml @@ -1,18 +1,18 @@ -kind: Service apiVersion: v1 +kind: Service metadata: - name: traefik-external + name: traefik-custom-controller namespace: kube-system spec: + type: LoadBalancer selector: - k8s-app: traefik-external + app: traefik-custom-controller ports: - protocol: TCP port: 9080 - targetPort: 9080 name: web + targetPort: 9080 - protocol: TCP port: 9443 - targetPort: 9443 name: websecure - type: LoadBalancer \ No newline at end of file + targetPort: 9443 \ No newline at end of file diff --git a/k8s/serviceaccount.yaml b/k8s/serviceaccount.yaml deleted file mode 100644 index 187258d..0000000 --- a/k8s/serviceaccount.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: traefik-external - namespace: kube-system \ No newline at end of file