From c6a9486c33e6a03fd9f3e87455d1fa21238b97ca Mon Sep 17 00:00:00 2001 From: Darren Semusemu <47727831+darrensemusemu@users.noreply.github.com> Date: Wed, 29 Jun 2022 00:11:03 +0200 Subject: [PATCH] fix(swagger-ui): add arg to container spec (#3) * wip: add arg to container spec * wip * wip * feat(swagger-ui): add build and deploy to pipeline * feat(swagger-ui): set skaffold top prod * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip c * wip * wip * wip * wip * wip * wip * wip: do not trigger * wip: remove always run * wip --- .prow/swagger-ui.yaml | 45 +++++++++++++------ README.md | 2 + api/openapi-spec/README.md | 1 + api/openapi-spec/skaffold.yaml | 1 - .../k8s/secrets/scaffold-service-account.yaml | 4 +- do-not-run | 1 + 6 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 do-not-run diff --git a/.prow/swagger-ui.yaml b/.prow/swagger-ui.yaml index 0d3d482..c8f4ccb 100644 --- a/.prow/swagger-ui.yaml +++ b/.prow/swagger-ui.yaml @@ -1,8 +1,8 @@ -postsubmits: +presubmits: - name: swagger-ui-deploy decorate: true clone_uri: "git@github.com:darrensemusemu/certify-d-api.git" - always_run: true + run_if_changed: '^((api\/openapi-spec\/.*(yaml|yml|Dockerfile))|(\.prow\/swagger[-]ui\.yaml))$' skip_report: false context: swagger-ui max_concurrency: 1 @@ -11,21 +11,40 @@ postsubmits: - name: skaffold image: "gcr.io/k8s-skaffold/skaffold:v1.38.0" command: ["/bin/sh", "-c"] - # args: - # - | - # gcloud auth activate-service-account --key-file=/secrets/scaffold-service-account.json && - # gcloud container clusters get-credentials $CLUSTER_DEV_NAME --region europe-west1-b && - # kubectl config get-contexts + args: + - | + echo "one" && + gcloud auth activate-service-account --key-file=/secrets/skaffold-service-account.json && + echo "one" && + gcloud config set project $PROJECT_DEV_NAME && + echo "one" && + gcloud container clusters get-credentials $CLUSTER_DEV_NAME --region europe-west1-b && + echo "one" && + kubectl config get-contexts && + echo "two" && + export STATE=$(git rev-list -1 HEAD --abbrev-commit) && + cat /secrets/skaffold-service-account.json | grep client_email && + skaffold build -m $SERVICE_NAME -p prod --file-output build-$STATE.json && + echo "three" && + skaffold deploy -m $SERVICE_NAME -a build-$STATE.json env: - name: CLUSTER_DEV_NAME - value: main-cluster + value: main-cluster + - name: PROJECT_DEV_NAME + value: darrensemusemu-infra + - name: PROJECT_DEV_REGION + value: europe-west1-b + - name: SERVICE_NAME + value: swagger-ui + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /secrets/skaffold-service-account.json resources: limits: - cpu: 64m - memory: 100Mi + cpu: 500m + memory: 256Mi requests: - cpu: 64m - memory: 100Mi + cpu: 100m + memory: 128Mi volumeMounts: - name: service-account mountPath: /secrets @@ -37,4 +56,4 @@ postsubmits: # branches: []z # skip_branches: [] # trigger: "(?m)qux test this( please)?" - # rerun_command: "qux test this please" + diff --git a/README.md b/README.md index a0ecb9e..105b98a 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ A document ceritifcation platform. ## Documentation [Architecture](docs/Architecture.md) + +Read more a \ No newline at end of file diff --git a/api/openapi-spec/README.md b/api/openapi-spec/README.md index 314afd2..8a03009 100644 --- a/api/openapi-spec/README.md +++ b/api/openapi-spec/README.md @@ -2,4 +2,5 @@ This folder contains an OpenAPI specification for Certify-d's API. +:P diff --git a/api/openapi-spec/skaffold.yaml b/api/openapi-spec/skaffold.yaml index 8615923..3ad1a0d 100644 --- a/api/openapi-spec/skaffold.yaml +++ b/api/openapi-spec/skaffold.yaml @@ -31,4 +31,3 @@ profiles: - europe-west1-docker.pkg.dev/darrensemusemu-infra/certify-d/swagger-ui googleCloudBuild: projectId: darrensemusemu-infra - diff --git a/conf/k8s/secrets/scaffold-service-account.yaml b/conf/k8s/secrets/scaffold-service-account.yaml index 18dd556..8dcad74 100644 --- a/conf/k8s/secrets/scaffold-service-account.yaml +++ b/conf/k8s/secrets/scaffold-service-account.yaml @@ -9,8 +9,8 @@ stringData: { "type": "service_account", "project_id": "darrensemusemu-infra", - "private_key_id": "82958ee829d5c1690235cac6f290802a33417661", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC0fKaYdUsQCU7n\nJH8aRKgGffMArd7IIfRsMD2pP+2BrsIaZzkI3zr3g/qiYCryhBYy+wqilr6YYTN5\nHRhqFEBIpTWpaRPCReT92cUSm5dHXIEtXhl613NfoU7SJ9WHMNZ+FSbSlLE4Ol9f\nTXhigx4Ka7FNP6xSewSRx3cbYRGuIS7bGujPF1o+X+NWqWsKbX/Wd86v3ZongdGR\nrzxb571EpOaNpP2GCwEpHZ3Wv6fPXGcJaup+KbA5dyZcCmp3m1uMgTYaps2Ji6xF\nhYkdkLvXBFUcPZ2H0wN56rT4pjd00f0cLWdqsPBB5phLoP+Y5/MIKVrkPQodyTj3\nqdg7btwpAgMBAAECggEABFCVj///2SSL0xlLg5aAGNWifVHqyUiMhhiaJMVvOWIy\n6DwvACAMEhZA4+heJnmTaUkYnj3x1QU/3IWeS4zr44C1mXT2YLbYjFwMKs927KEQ\nwoOlIstrSe46iuoiX+7CNfXt/WtKGFDG7mmU9u/xBClCbhkXVspzl8OXvJsTt+Cv\nZ5jNRK6QAP/PKdL3Xo4Yfpq6XVcRdIr5velANS1HhY2AmPk4VPD2xah/A8+IeWbw\nFtW6pPTLGbXfqnVMWoatgeAD8QCo4YQPVOFaJpmamF4DW2WDSDZyJFzepEJkvcBw\nPTO0iNzflaVF2gn63r95QXW2x/RYsvZkXCPK9mU+zQKBgQDmLIbhxvsEi9XhhHGO\nyLcp5KAWRxTk79QNhwwTzpH4XDLym6ZVtJ1dIIC6FgkwELlqEQ/emmt06+0CjtDu\nAlEWlGFs3CDQ1mWRsmBvZRJp7zUOJzvFth+fVXAcUAUV/i014K9XXVj8RziY+Gih\nHUHQyEL8KHbIJaE9TusBbT4ZzQKBgQDIvOxdY47ispxH5WVgEpQOLm0RpyvXOfpF\nJH7yZfV0tUxjYpAw6+QRU0gZlRQL/vJ7RW0lWVtzJIgTpyjE1Itq/a0H3NZQqAww\nj68AUgstBg+eTodEZkWSfxRuugZ6Cny/crqvRR4JtS2cF9AD18nqtLuP2OD9FqfJ\nkr5p9AX/zQKBgGqOypLTj3n3Urjom7nCailW0lX96kpiTQVGM+0ngKQ96sguDr82\nsnNejLmZYf+CfpP/+hzP2Fd0sXCxtT+6itetMb0322lTGApvTf3ECNZKC4HV3/IT\n8mfNIe25jeE0nrGGpyYG7R89yZHnzmhoJwQE8h3SjcrywMalNl6euFUxAoGACJ6E\nD6Z8tiMxLq0c4zko/krkCAQDj+Q/aMSeZs4V8gLu2r2ar18RleTbja2nBLTXuI9M\nlnP1x0XkSeO9jmYJ7ngh+9pxoVj13QfuXbcoH7DI7uU0Ta2OgzHNsMtwB8F3hcjp\nVylCluwenzsuhVu4oclM3GpVjshwP+l7H5WIxGkCgYAwHAuhwL0lqDGgrQmkTS2z\nmM8vGzQVawPmvPZtsD9z7j3Haf5eD+2hWOYyEl5WKuSZq3bRMJ1G82GOqvhaPeuT\ndBCRr2/9wsaDMzn/z43pGwH0RYEs9Gb8f6oj0VvN5Tlrah5UqmPW2BZCxCpl5ghP\nrbXcsls/2mu7+z+SC7E6pQ==\n-----END PRIVATE KEY-----\n", + "private_key_id": "883e6a7716c48e87fc7ddf0660b320deb721a9d1", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDvrmSfTMI0KL36\nX9cigywR3QmtiUfawDE/NBSop153HtG1BjsvP8zJYJZz1MabToMbwa4imUveByL6\nQtJMdJm6HF85UNEoTYqOGXYUYh9QJGUzKvMb62hQ8ullWUgUeYl2LnYU38Svy8Ws\n68TJ1xMPrMzyne32q/PZcKKPJS3bpKjH5xZG1/JMLEjwXJShE3SzEpt8hs3rKLLg\nGrg7cwKVpSxMLzPL/YtdRNFM7LwlcZy40yaC4XRTWCHBpGBMp9fmJKLuvU5GbDhA\nOBs+5ouIRGtPvy9UBMiTp5O4KJAia/mRWQQqxMuXw7S/FU3lhQ+eXLodqq2CHU32\nXt6ag0PPAgMBAAECggEAAu71YByLFryJURp0++dzSO3ihvAY4/AACkzjlD0/XKGq\noZanopUbNztXGNugHKZLpRgFpUdcB6Xttl0BmhomB+jKySnlWjyf6mWCx1tJR9Lr\nz1vPHIBELa1zagahz7WKSnR+6uCvbxL4fElpOXeU56QbraJ9Y/+U9r9rdek+FCPI\nzqHf/XCxB0N8GG01p1ldS8r4gXxfJGsWqYPdppC1b57IC1rXn5LGH5oVGqNE1tQH\neb/kPqc4H+Q3rqa1Y8Id/f/nk0i+aT7jCoytg/K1AWbgwXViu6IlBEPTMrx0GU5K\novbRB7SR78EqT7148CZHaiMInOdDWZqH7ZtmRuQmhQKBgQD7gb+NJbDZK03Rs8lf\n+Gznj3/7xgIJilvaHXzi+0NDD7FsFHdfkxvLToUZDT9bQ1ekvpJc86KVh1fgnqQW\nPPY6+jmNDGJa4OL6n00gvKHPy0aq9o5cdm/ht6w6DcePdUN9wzS+BjH6meQ06sQr\nTIJDwNO5qhOUPulObAIybjP/AwKBgQDz9o+jpaSSIxlVFSgqPEHfh0H41kAjZVq4\ndbive+H/8+4MlOLDZbmZxBAljir54/Zx1yfc0pmt1X+j9ZZYqFjOUo/YUkeD6qjH\nNTHP1CBdGpMqK8K/U6WcI/CK3GAIs0oDl0rtJ0lMyW8iFvaQWb9ea2tV8Xm3/hQi\nu2BhRMfYRQKBgB2LwYgAXIU2rB6tg0Ot+IU/e2aFfWnHgkDeY/R6Vg2Dw3ER+nAU\n5Rf+Mm6d+spq39nvtVwMFxZ/3tf5awddxANrr+UdBlTsxF1y52moH0488CFXc6Pz\nGfOnUylCwyXcPcCBdSm5qpdpCsEYr1Dy3P6+oWDXVRN+TIQ09hEclyknAoGAWtNt\nkKBnj5yPntR8mpTKdXy2u/yP7l2ak9gIBRUbA559/qMjdVmW6r9Kv6CZMWWEZ8eR\naK3jVwuINLOG4MT0IwQr135yb5NaeKe+PsCbt+3f4jBelbp/ioz6zcfT3QlawdF+\nrKIWsQbBYDCqZP10uKNHV7zJ8w0d0/xsmmnv+P0CgYEAyfClqekcDK0XX7MoMpjO\nKPYRquTBBDs8Qq42XBicEitsl/fL+v6amiHZ6VXSDUkqjSPpmeI/f81YshyiUd5C\n0M7Dys9Z3H2+SqdxOJap0ErfczRpoLBOsVnMvarODuXIQYzfP4x0x8tLscv4ArEh\n3pVtrrFGmL40akKBEl0EyGM=\n-----END PRIVATE KEY-----\n", "client_email": "skaffold-cicd@darrensemusemu-infra.iam.gserviceaccount.com", "client_id": "110826989585829854519", "auth_uri": "https://accounts.google.com/o/oauth2/auth", diff --git a/do-not-run b/do-not-run new file mode 100644 index 0000000..7c4a013 --- /dev/null +++ b/do-not-run @@ -0,0 +1 @@ +aaa \ No newline at end of file