From 5072a13c7cf4dddb236b479322d6c6b6b3568ba1 Mon Sep 17 00:00:00 2001 From: Erwin van Eyk Date: Thu, 14 Sep 2017 13:34:52 -0700 Subject: [PATCH] Removed obsolete Kubernetes YAMLs (#327) We've switched to helm, and the switch seems to be going well, so that's the only supported installation method now. --- fission-cloud.yaml | 69 -------------- fission-logger.yaml | 122 ------------------------- fission-nats.yaml | 60 ------------ fission-nodeport.yaml | 69 -------------- fission-openshift.yaml | 202 ----------------------------------------- fission-rbac.yaml | 159 -------------------------------- fission.yaml | 127 -------------------------- 7 files changed, 808 deletions(-) delete mode 100644 fission-cloud.yaml delete mode 100644 fission-logger.yaml delete mode 100644 fission-nats.yaml delete mode 100644 fission-nodeport.yaml delete mode 100644 fission-openshift.yaml delete mode 100644 fission-rbac.yaml delete mode 100644 fission.yaml diff --git a/fission-cloud.yaml b/fission-cloud.yaml deleted file mode 100644 index cf34d847..00000000 --- a/fission-cloud.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: router - namespace: fission - labels: - svc: router -spec: - type: LoadBalancer - ports: - - port: 80 - targetPort: 8888 - nodePort: 31314 - selector: - svc: router - ---- -apiVersion: v1 -kind: Service -metadata: - name: controller - namespace: fission - labels: - svc: controller -spec: - type: LoadBalancer - ports: - - port: 80 - targetPort: 8888 - nodePort: 31313 - selector: - svc: controller - ---- -# If you want to switch to external db service, please checkout -# sample Kubernetes Service config in fission-logger.yaml. -apiVersion: v1 -kind: Service -metadata: - name: influxdb - namespace: fission - labels: - svc: influxdb -spec: - type: LoadBalancer - ports: - - port: 8086 - targetPort: 8086 - nodePort: 31315 - selector: - svc: influxdb - ---- - -apiVersion: v1 -kind: Service -metadata: - name: nats-streaming - namespace: fission - labels: - svc: nats-streaming -spec: - type: LoadBalancer - ports: - - port: 4222 - targetPort: 4222 - nodePort: 31316 - selector: - svc: nats-streaming \ No newline at end of file diff --git a/fission-logger.yaml b/fission-logger.yaml deleted file mode 100644 index 3b4bcc5a..00000000 --- a/fission-logger.yaml +++ /dev/null @@ -1,122 +0,0 @@ -# Sample Kubernetes Service config for external db service. -# -# apiVersion: v1 -# kind: Service -# metadata: -# name: influxdb -# namespace: fission -# spec: -# ports: -# - name: "8086" -# port: 8086 -# targetPort: 8086 -# protocol: TCP - -# --- -# apiVersion: v1 -# kind: Endpoints -# metadata: -# name: influxdb -# namespace: fission -# subsets: -# - addresses: -# - ip: replace.influxdb.host.here -# ports: -# - name: "8086" -# port: 8086 -# protocol: TCP - -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: influxdb - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: influxdb - spec: - containers: - - name: influxdb - image: tutum/influxdb - env: - - name: PRE_CREATE_DB - value: fissionFunctionLog - # Create a random username/password for InfluxDB here, and - # repeat it in the fluentd spec below. - - name: ADMIN_USER - value: "" - - name: INFLUXDB_INIT_PWD - value: "" - ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: logger - namespace: fission -spec: - template: - metadata: - labels: - svc: logger - spec: - containers: - - name: logger - image: fission/fission-bundle - imagePullPolicy: IfNotPresent - command: ["/fission-bundle"] - args: ["--logger"] - volumeMounts: - - name: container-log - mountPath: /var/log/containers - readOnly: true - - name: docker-log - mountPath: /var/lib/docker/containers - readOnly: true - - name: fission-log - mountPath: /var/log/fission - readOnly: false - ports: - - containerPort: 1234 - hostPort: 1234 - protocol: TCP - - name: fluentd - image: fission/fluentd - imagePullPolicy: IfNotPresent - env: - - name: INFLUXDB_ADDRESS - value: influxdb - - name: INFLUXDB_PORT - value: "8086" - - name: INFLUXDB_DBNAME - value: "fissionFunctionLog" - # Username/password for fluentd to push logs to - # influxdb. This should match the influxdb - # username/passowrd defined above. - - name: INFLUXDB_USERNAME - value: "" - - name: INFLUXDB_PASSWD - value: "" - volumeMounts: - - name: container-log - mountPath: /var/log/containers - readOnly: true - - name: docker-log - mountPath: /var/lib/docker/containers - readOnly: true - - name: fission-log - mountPath: /var/log/fission - readOnly: false - volumes: - - name: container-log - hostPath: - path: /var/log/containers - - name: docker-log - hostPath: - path: /var/lib/docker/containers - - name: fission-log - hostPath: - path: /var/log/fission diff --git a/fission-nats.yaml b/fission-nats.yaml deleted file mode 100644 index 9e0f5eeb..00000000 --- a/fission-nats.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# To enable nats authentication, please follow the instruction described in -# http://nats.io/documentation/server/gnatsd-authentication/. -# And dont forget to change the MESSAGE_QUEUE_URL in mqtrigger deployment. - -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: mqtrigger - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: mqtrigger - spec: - containers: - - name: mqtrigger - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--mqt"] - env: - - name: MESSAGE_QUEUE_TYPE - value: nats-streaming - - name: MESSAGE_QUEUE_URL - value: nats://nats-streaming:4222 - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - svc: nats-streaming - name: nats-streaming - namespace: fission -spec: - replicas: 1 - selector: - matchLabels: - svc: nats-streaming - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 1 - type: RollingUpdate - template: - metadata: - creationTimestamp: null - labels: - svc: nats-streaming - spec: - containers: - - name: nats-streaming - image: nats-streaming - args: ["--cluster_id", "fissionMQTrigger"] - ports: - - containerPort: 4222 - hostPort: 4222 - protocol: TCP - diff --git a/fission-nodeport.yaml b/fission-nodeport.yaml deleted file mode 100644 index 62730fc9..00000000 --- a/fission-nodeport.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: router - namespace: fission - labels: - svc: router -spec: - type: NodePort - ports: - - port: 80 - targetPort: 8888 - nodePort: 31314 - selector: - svc: router - ---- -apiVersion: v1 -kind: Service -metadata: - name: controller - namespace: fission - labels: - svc: controller -spec: - type: NodePort - ports: - - port: 80 - targetPort: 8888 - nodePort: 31313 - selector: - svc: controller - ---- -# If you want to switch to external db service, please checkout -# sample Kubernetes Service config in fission-logger.yaml. -apiVersion: v1 -kind: Service -metadata: - name: influxdb - namespace: fission - labels: - svc: influxdb -spec: - type: NodePort - ports: - - port: 8086 - targetPort: 8086 - nodePort: 31315 - selector: - svc: influxdb - ---- - -apiVersion: v1 -kind: Service -metadata: - name: nats-streaming - namespace: fission - labels: - svc: nats-streaming -spec: - type: NodePort - ports: - - port: 4222 - targetPort: 4222 - nodePort: 31316 - selector: - svc: nats-streaming \ No newline at end of file diff --git a/fission-openshift.yaml b/fission-openshift.yaml deleted file mode 100644 index 81cfb851..00000000 --- a/fission-openshift.yaml +++ /dev/null @@ -1,202 +0,0 @@ ---- -apiVersion: v1 -kind: ProjectRequest -metadata: - name: fission - labels: - name: fission - ---- -apiVersion: v1 -kind: ProjectRequest -metadata: - name: fission-function - labels: - name: fission-function - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: poolmgr - namespace: fission - ---- -apiVersion: v1 -kind: ClusterRole -metadata: - name: fission:poolmgr -rules: -- apiGroups: - - extensions - attributeRestrictions: null - resources: - - deployments - verbs: - - create - - get - - list - - update - - watch -- apiGroups: - - "" - attributeRestrictions: null - resources: - - pods - verbs: - - get - - list - - update - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: controller - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: controller - spec: - volumes: - - name: controller-storage - emptyDir: {} - containers: - - name: controller - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--controllerPort", "8888", "--filepath", "/filestore"] - volumeMounts: - - name: controller-storage - mountPath: /filestore - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: router - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: router - spec: - containers: - - name: router - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--routerPort", "8888"] - ---- -apiVersion: v1 -kind: Service -metadata: - name: poolmgr - namespace: fission - labels: - svc: poolmgr -spec: - ports: - - port: 80 - targetPort: 8888 - selector: - svc: poolmgr - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: poolmgr - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: poolmgr - spec: - containers: - - name: poolmgr - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--poolmgrPort", "8888"] - serviceAccount: poolmgr - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: kubewatcher - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: kubewatcher - spec: - containers: - - name: kubewatcher - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--kubewatcher"] - ---- -apiVersion: v1 -kind: Service -metadata: - name: etcd - namespace: fission - labels: - svc: etcd -spec: - ports: - - port: 2379 - targetPort: 2379 - selector: - svc: etcd - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: etcd - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: etcd - spec: - containers: - - name: etcd - image: quay.io/coreos/etcd - env: - - name: ETCD_LISTEN_CLIENT_URLS - value: http://0.0.0.0:2379 - - name: ETCD_ADVERTISE_CLIENT_URLS - value: http://etcd:2379 - - name: ETCD_DATA_DIR - value: /tmp/default.etcd - ---- -apiVersion: v1 -groupNames: null -kind: RoleBinding -metadata: - name: fission:poolmgr - namespace: fission-function -roleRef: - name: fission:poolmgr -subjects: -- kind: ServiceAccount - name: poolmgr - namespace: fission -userNames: -- system:serviceaccount:fission:poolmgr diff --git a/fission-rbac.yaml b/fission-rbac.yaml deleted file mode 100644 index 07aa3f56..00000000 --- a/fission-rbac.yaml +++ /dev/null @@ -1,159 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: fission - labels: - name: fission ---- -apiVersion: v1 -kind: Namespace -metadata: - name: fission-function - labels: - name: fission-function ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fission-svc - namespace: fission ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1alpha1 -metadata: - name: fission-admin - namespace: fission -subjects: - - kind: ServiceAccount - name: fission-svc - namespace: fission -roleRef: - kind: ClusterRole - name: admin - apiGroup: rbac.authorization.k8s.io ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1alpha1 -metadata: - name: fission-function-admin - namespace: fission-function -subjects: - - kind: ServiceAccount - name: fission-svc - namespace: fission -roleRef: - kind: ClusterRole - name: admin - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fission-fetcher - namespace: fission-function ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 -metadata: - name: fission-fetcher-tpr -subjects: -- kind: ServiceAccount - name: fission-fetcher - namespace: fission-function -roleRef: - kind: ClusterRole - name: cluster-admin - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: controller - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: controller - spec: - containers: - - name: controller - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--controllerPort", "8888"] - serviceAccountName: fission-svc ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: router - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: router - spec: - containers: - - name: router - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--routerPort", "8888"] - serviceAccountName: fission-svc ---- -apiVersion: v1 -kind: Service -metadata: - name: poolmgr - namespace: fission - labels: - svc: poolmgr -spec: - ports: - - port: 80 - targetPort: 8888 - selector: - svc: poolmgr ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: poolmgr - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: poolmgr - spec: - containers: - - name: poolmgr - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--poolmgrPort", "8888"] - env: - - name: FETCHER_IMAGE - value: fission/fetcher:v2 - serviceAccountName: fission-svc ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: kubewatcher - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: kubewatcher - spec: - containers: - - name: kubewatcher - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--kubewatcher"] - serviceAccountName: fission-svc diff --git a/fission.yaml b/fission.yaml deleted file mode 100644 index 8424de1d..00000000 --- a/fission.yaml +++ /dev/null @@ -1,127 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: fission - labels: - name: fission - ---- -apiVersion: v1 -kind: Namespace -metadata: - name: fission-function - labels: - name: fission-function - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: controller - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: controller - spec: - containers: - - name: controller - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--controllerPort", "8888"] - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: router - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: router - spec: - containers: - - name: router - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--routerPort", "8888"] - ---- -apiVersion: v1 -kind: Service -metadata: - name: poolmgr - namespace: fission - labels: - svc: poolmgr -spec: - ports: - - port: 80 - targetPort: 8888 - selector: - svc: poolmgr - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: poolmgr - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: poolmgr - spec: - containers: - - name: poolmgr - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--poolmgrPort", "8888"] - env: - - name: FETCHER_IMAGE - value: fission/fetcher:v2 - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: kubewatcher - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: kubewatcher - spec: - containers: - - name: kubewatcher - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--kubewatcher"] - ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: timer - namespace: fission -spec: - replicas: 1 - template: - metadata: - labels: - svc: timer - spec: - containers: - - name: timer - image: fission/fission-bundle - command: ["/fission-bundle"] - args: ["--timer"]