diff --git a/keel/deployment.yaml b/keel/deployment.yaml index f0ac9f7..a67fe13 100644 --- a/keel/deployment.yaml +++ b/keel/deployment.yaml @@ -1,21 +1,16 @@ ---- - apiVersion: v1 kind: Namespace metadata: - name: "{{ .namespace | default "keel" }}" - + name: keel --- apiVersion: v1 kind: ServiceAccount metadata: name: keel - namespace: "{{ .namespace | default "keel" }}" + namespace: keel labels: app: keel - --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -52,7 +47,7 @@ rules: - cronjobs verbs: - get - - delete # required to delete pods during force upgrade of the same tag + - delete - watch - list - update @@ -65,10 +60,7 @@ rules: - get - create - update - - --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: @@ -80,14 +72,13 @@ roleRef: subjects: - kind: ServiceAccount name: keel - namespace: "{{ .namespace | default "keel" }}" + namespace: keel --- - apiVersion: v1 kind: Service metadata: name: keel - namespace: "{{ .namespace | default "keel" }}" + namespace: keel labels: app: keel spec: @@ -100,13 +91,12 @@ spec: selector: app: keel sessionAffinity: None - --- apiVersion: apps/v1 kind: Deployment metadata: name: keel - namespace: "{{ .namespace | default "keel" }}" + namespace: keel labels: app: keel spec: @@ -121,28 +111,8 @@ spec: spec: serviceAccountName: keel containers: - {{ if .relay_key }} - - name: webhookrelayd - image: "webhookrelay/webhookrelayd:latest" - imagePullPolicy: Always - {{ if .relay_tunnel}} - command: ["/relayd", "--mode", "tunnel", "--tunnels", "{{ .relay_tunnel }}"] - {{ else }} - command: ["/relayd"] - {{ end}} - env: - - name: KEY - value: {{ .relay_key }} - - name: SECRET - value: {{ .relay_secret }} - {{ if .relay_bucket }} - - name: BUCKET - value: "{{ .relay_bucket }}" - {{ end }} - {{ end }} - name: keel - # Note that we use appVersion to get images tag. - image: "keelhq/keel:{{ .tag | latestRegistrySemver "keelhq/keel" }}" + image: "keelhq/keel:0.20.0" imagePullPolicy: Always command: ["/bin/keel"] env: @@ -150,67 +120,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - # Enable GCR with pub/sub support - - name: PROJECT_ID - value: "{{ .project_id }}" - - name: PUBSUB - value: "{{ .pubsub }}" # Set to '1' or 'true' to enable GCR pubsub - # Basic auth (to enable UI/API) - - name: BASIC_AUTH_USER - value: {{ .username }} - - name: BASIC_AUTH_PASSWORD - value: {{ .password }} - - name: AUTHENTICATED_WEBHOOKS - value: "{{ .authenticated_webhooks | default "false" }}" - # Helm configuration - {{ if.tiller_namespace }} - - name: HELM_PROVIDER - value: "1" - - name: TILLER_NAMESPACE - value: "{{ .tiller_namespace }}" - {{ end}} - # Enable AWS ECR - - name: AWS_ACCESS_KEY_ID - value: "" - - name: AWS_SECRET_ACCESS_KEY - value: "" - - name: AWS_REGION - value: "" - # Enable webhook endpoint - name: WEBHOOK_ENDPOINT - value: "https://192.168.0.200:9090" - # Enable mattermost endpoint - - name: MATTERMOST_ENDPOINT - value: "" - # Enable MS Teams webhook endpoint - - name: TEAMS_WEBHOOK_URL - value: "{{ .teams_webhook_url }}" - - name: SLACK_TOKEN - value: "{{ .slack_token }}" - - name: SLACK_CHANNELS - value: "{{ .slack_channel | default "general" }}" - - name: SLACK_APPROVALS_CHANNEL - value: "{{ .slack_approvals_channel | default "general" }}" - - name: SLACK_BOT_NAME - value: "{{ .bot_name | default "keel" }}" - # Enable hipchat approvials and notification - - name: HIPCHAT_TOKEN - value: "" - - name: HIPCHAT_CHANNELS - value: "" - - name: HIPCHAT_APPROVALS_CHANNEL - value: "" - - name: HIPCHAT_APPROVALS_BOT_NAME - value: "" - - name: HIPCHAT_APPROVALS_USER_NAME - value: "" - - name: HIPCHAT_APPROVALS_PASSWORT - value: "" + value: "http://192.168.0.200:9090/notify" - name: NOTIFICATION_LEVEL value: "info" - # Enable insecure registries - - name: INSECURE_REGISTRY - value: "true" ports: - containerPort: 9300 livenessProbe: @@ -226,29 +139,15 @@ spec: requests: cpu: 50m memory: 64Mi - {{ if.volume_name }} - volumeMounts: - - mountPath: /data - name: keel-data # must match the name of the volume - # Provision a fresh volume for the pod - volumes: - - name: keel-data - gcePersistentDisk: - # This disk must already exist. Check Readme - pdName: {{ .volume_name | default "keel-data" }} - fsType: ext4 - {{ end }} - --- -# Source: keel/templates/pod-disruption-budget.yaml - apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: keel - namespace: "{{ .namespace | default "keel" }}" + namespace: keel spec: maxUnavailable: 1 selector: matchLabels: app: keel +