diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a153d8..b6e3beb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,9 +28,9 @@ deploy: when: always extends: [.kube-context] image: - name: bitnami/kubectl:latest + name: registry.yaemiku.dev/kubectl entrypoint: [""] script: - ls - - cat $CI_PROJECT_DIR/deployment.yaml | envsubst | kubectl apply -f - + - cat $CI_PROJECT_PATH/deployment.yaml | envsubst | kubectl apply -f - - kubectl get pods diff --git a/deployment.yaml b/deployment.yaml index cf5f1f2..17e6d2a 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -1,19 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: hamburger + name: $CI_PROJECT_NAME spec: selector: matchLabels: - app: hamburger + app: $CI_PROJECT_NAME replicas: 1 template: metadata: labels: - app: hamburger + app: $CI_PROJECT_NAME spec: containers: - - name: hamburger + - name: $CI_PROJECT_NAME image: "$REGISTRY/$REGISTRY_USERNAME/$CI_PROJECT_NAME" ports: - name: app-port @@ -32,32 +32,32 @@ spec: apiVersion: v1 kind: Service metadata: - name: hamburger + name: $CI_PROJECT_NAME spec: ports: - name: app-svc-port port: 80 targetPort: app-port selector: - app: hamburger + app: $CI_PROJECT_NAME --- apiVersion: traefik.containo.us/v1alpha1 kind: IngressRoute metadata: - name: hamburger + name: $CI_PROJECT_NAME spec: entryPoints: - websecure routes: - kind: Rule - match: Host(`yaemiku.dev`) + match: Host(`yaemiku.dev`) || Host(`www.yaemiku.dev`) services: - kind: Service - name: hamburger + name: $CI_PROJECT_NAME port: app-svc-port tls: - secretName: hamburger-tls + secretName: $CI_PROJECT_NAME-tls certResolver: letsencrypt-prod domains: - main: yaemiku.dev