diff --git a/base/deployment.yaml b/base/deployment.yaml index 762c3b7..2a6fcf2 100644 --- a/base/deployment.yaml +++ b/base/deployment.yaml @@ -21,12 +21,12 @@ spec: ports: - containerPort: 8000 env: + - name: MEMCACHED_HOST_PATH + value: "memcached:11211" - name: NUM_WORKERS value: "3" - name: OSM_CACHE_DIR value: "/osm-cache" - - name: MEMCACHED_HOST_PATH - value: "memcached:11211" volumeMounts: - name: osm-cache mountPath: /osm-cache diff --git a/kubeconfig b/kubeconfig new file mode 100644 index 0000000..d12e2a8 --- /dev/null +++ b/kubeconfig @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Config +clusters: +- name: kluster + cluster: + server: https://192.168.1.222:6443 + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJpVENDQVMrZ0F3SUJBZ0lRYURlTUZ0N3lxc3NNZDFwWHZoZ2l2VEFLQmdncWhrak9QUVFEQWpBVk1STXcKRVFZRFZRUUtFd3ByZFdKbGNtNWxkR1Z6TUI0WERUSTBNRGt4TXpBeE1qZ3hNbG9YRFRNME1Ea3hNVEF4TWpneApNbG93RlRFVE1CRUdBMVVFQ2hNS2EzVmlaWEp1WlhSbGN6QlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VICkEwSUFCQktzTTdDMTlTSFY1R0hpbmJRUE9JQy9BMW5iZWJrYmI2NU1jU0t3MmlOR1U0RGFkRUlnZGpWY01pdGQKakhWQnhxdmM2T3Y1L0hRa3VMS0doaTk1TmdtallUQmZNQTRHQTFVZER3RUIvd1FFQXdJQ2hEQWRCZ05WSFNVRQpGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFCkZnUVU5T1FUWkNhbjVpWjc1N0VIMWFQZXFUc0lFVXd3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRUU1MUZTdFIKb3BmUWlaazE2ZXlteExtRC96b1gzdUovRlZVMnY1UVVIUjhDSVFDc1FMakwxcGZ5eVZ1UUhablAxYjJtNGRxZApqVmgyLzc3MTJ2YXNVL2dPaGc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== +users: +- name: deployment-sa + user: + token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjhGV1pyZ0ZueFFkTnFPeU84Q0dUaW5sd0FMN1JTOXpFclNrZVlPV3NwRVUifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJhbnl3YXktYmFja2VuZCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJkZXBsb3ltZW50LXRva2VuLXNlY3JldCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJkZXBsb3ltZW50LXNhIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQudWlkIjoiOWU3OTk4NWItN2IyZi00ZjM4LWE5YzUtYjlkYzRjODI0MzNjIiwic3ViIjoic3lzdGVtOnNlcnZpY2VhY2NvdW50OmFueXdheS1iYWNrZW5kOmRlcGxveW1lbnQtc2EifQ.X6SCfp7SK4EOadPDG2naKOEBUt2HIO8qi3Z-IDruszIdOgoUdSQktRBrO2IreUMwG8GoeZ0EaZan-CxmoRoPok8LES12JSr--ZW4XpyWxMf_i5hu5dUwOAeJOHWjTNpawcNKSlqZXOKITPU0Ljhgh_WiPzxT2jONBmwsCT5KVsxC7EC0qnpshHQqv03xg89Jei89qFsIs94-vs3sNJqIHoZqjqvcSTP2mf5nX6zKpQEPnMG06UNqWz9szyWfJzasBjuJZ4aB4s97xW9YCMzfWLghUe3Jj4i90N1As8RL8BlmiX_IX9bdpv6PbIzG5TW0wsa3w5ZMccsxVc4jYWSt9wOu9ffL4b4MA9zelfgqnxqXm40t7uXPrzPJ1KN2pDIi81e1HSczV-E1Po7feR7_x8py6LFIMgekHX6inY9AfPSuA7-p5MhLWun8L6O3vGMmj1d01e1AJESg_24nP71Smkze4pWByrDaPVoogCV8fjyEvau3wC5pPo-9dSNVh_0F3Pw4M8aMQsZEdj9Xy4CsLR2OVDgDx4xKQUe560snXB32qq5E_AHhqYL518qxGR_mP1VFKtFOEs8yUZZz49bwqySyAlfnxwpr_Dyg_PQCXabLZm_s-jU5d_7p7o_qn1ewUKX1Asx-_3O_4I6hmEsfPHqhmWffwxuYSaJ8cHwCqfs +contexts: +- context: + cluster: kluster + namespace: default + user: deployment-sa + name: deployment-sa@kluster +current-context: deployment-sa@kluster diff --git a/overlays/prod/kustomization.yaml b/overlays/prod/kustomization.yaml index 76506c6..46f6840 100644 --- a/overlays/prod/kustomization.yaml +++ b/overlays/prod/kustomization.yaml @@ -17,3 +17,7 @@ patches: target: kind: IngressRoute name: anyway-ingress + - path: patch-deployment-memcached-address.yaml + target: + kind: Deployment + name: anyway-backend diff --git a/overlays/prod/patch-deployment-memcached-address.yaml b/overlays/prod/patch-deployment-memcached-address.yaml new file mode 100644 index 0000000..6933a86 --- /dev/null +++ b/overlays/prod/patch-deployment-memcached-address.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/template/spec/containers/0/env/0/value + value: "memcached-prod:11211" diff --git a/overlays/prod/patch-ingress.yaml b/overlays/prod/patch-ingress.yaml index 83800fa..9a19deb 100644 --- a/overlays/prod/patch-ingress.yaml +++ b/overlays/prod/patch-ingress.yaml @@ -1,3 +1,3 @@ -- op: replace #action +- op: replace path: /spec/routes/0/match value: Host(`anyway.anydev.info`) || Host(`anyway.kluster.moll.re`) diff --git a/overlays/stg/kustomization.yaml b/overlays/stg/kustomization.yaml index 9d2dbd2..35e8a53 100644 --- a/overlays/stg/kustomization.yaml +++ b/overlays/stg/kustomization.yaml @@ -16,3 +16,7 @@ patches: target: kind: IngressRoute name: anyway-ingress + - path: patch-deployment-memcached-address.yaml + target: + kind: Deployment + name: anyway-backend diff --git a/overlays/stg/patch-deployment-memcached-address.yaml b/overlays/stg/patch-deployment-memcached-address.yaml new file mode 100644 index 0000000..4d2eada --- /dev/null +++ b/overlays/stg/patch-deployment-memcached-address.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/template/spec/containers/0/env/0/value + value: "memcached-stg:11211" diff --git a/rbac.yaml b/rbac.yaml index 4f5a832..ef42cdb 100644 --- a/rbac.yaml +++ b/rbac.yaml @@ -4,12 +4,16 @@ metadata: namespace: anyway-backend name: deployment-role rules: -- apiGroups: [""] # "" indicates the core API group +- apiGroups: + - "" + - "apps" + - "traefik.io" resources: - pods - services - deployments - - ingresses + - ingressroutes + - persistentvolumeclaims verbs: - create - delete