-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(k8s): imagePullSecrets weren't copied to the project namespace
The documented and expected behavior was to copy secrets referenced in the `imagePullSecrets` field in the `kubernetes` provider config.
- Loading branch information
Showing
6 changed files
with
179 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
garden-service/test/integ/src/plugins/kubernetes/container/deployment.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| * Copyright (C) 2018-2020 Garden Technologies, Inc. <[email protected]> | ||
| * | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
|
|
||
| import { getDataDir, makeTestGarden } from "../../../../../helpers" | ||
| import { expect } from "chai" | ||
| import { Garden } from "../../../../../../src/garden" | ||
| import { ConfigGraph } from "../../../../../../src/config-graph" | ||
| import { emptyRuntimeContext } from "../../../../../../src/runtime-context" | ||
| import { KubeApi } from "../../../../../../src/plugins/kubernetes/api" | ||
| import { createWorkloadManifest } from "../../../../../../src/plugins/kubernetes/container/deployment" | ||
| import { KubernetesProvider } from "../../../../../../src/plugins/kubernetes/config" | ||
| import { ensureSecret } from "../../../../../../src/plugins/kubernetes/secrets" | ||
| import { V1Secret } from "@kubernetes/client-node" | ||
| import { KubernetesResource } from "../../../../../../src/plugins/kubernetes/types" | ||
| import { cloneDeep } from "lodash" | ||
|
|
||
| describe("kubernetes container deployment handlers", () => { | ||
| let garden: Garden | ||
| let graph: ConfigGraph | ||
| let provider: KubernetesProvider | ||
| let api: KubeApi | ||
|
|
||
| before(async () => { | ||
| const root = getDataDir("test-projects", "container") | ||
| garden = await makeTestGarden(root) | ||
| graph = await garden.getConfigGraph(garden.log) | ||
| provider = <KubernetesProvider>await garden.resolveProvider("local-kubernetes") | ||
| api = await KubeApi.factory(garden.log, provider) | ||
| }) | ||
|
|
||
| after(async () => { | ||
| await garden.close() | ||
| }) | ||
|
|
||
| describe("createWorkloadManifest", () => { | ||
| it("should create a basic Deployment resource", async () => { | ||
| const service = await graph.getService("simple-service") | ||
|
|
||
| const resource = await createWorkloadManifest({ | ||
| api, | ||
| provider, | ||
| service, | ||
| runtimeContext: emptyRuntimeContext, | ||
| namespace: garden.projectName, | ||
| enableHotReload: false, | ||
| log: garden.log, | ||
| production: false, | ||
| }) | ||
|
|
||
| const version = service.module.version.versionString | ||
|
|
||
| expect(resource).to.eql({ | ||
| kind: "Deployment", | ||
| apiVersion: "apps/v1", | ||
| metadata: { | ||
| name: "simple-service-" + version, | ||
| annotations: { "garden.io/configured.replicas": "1" }, | ||
| namespace: "container", | ||
| labels: { "module": "simple-service", "service": "simple-service", "garden.io/version": version }, | ||
| }, | ||
| spec: { | ||
| selector: { matchLabels: { "service": "simple-service", "garden.io/version": version } }, | ||
| template: { | ||
| metadata: { | ||
| labels: { "module": "simple-service", "service": "simple-service", "garden.io/version": version }, | ||
| }, | ||
| spec: { | ||
| containers: [ | ||
| { | ||
| name: "simple-service", | ||
| image: "simple-service:" + version, | ||
| env: [ | ||
| { name: "POD_NAME", valueFrom: { fieldRef: { fieldPath: "metadata.name" } } }, | ||
| { name: "POD_NAMESPACE", valueFrom: { fieldRef: { fieldPath: "metadata.namespace" } } }, | ||
| { name: "POD_IP", valueFrom: { fieldRef: { fieldPath: "status.podIP" } } }, | ||
| { name: "POD_SERVICE_ACCOUNT", valueFrom: { fieldRef: { fieldPath: "spec.serviceAccountName" } } }, | ||
| ], | ||
| ports: [{ name: "http", protocol: "TCP", containerPort: 8080 }], | ||
| resources: { requests: { cpu: "10m", memory: "64Mi" }, limits: { cpu: "1", memory: "1Gi" } }, | ||
| imagePullPolicy: "IfNotPresent", | ||
| securityContext: { allowPrivilegeEscalation: false }, | ||
| }, | ||
| ], | ||
| restartPolicy: "Always", | ||
| terminationGracePeriodSeconds: 5, | ||
| dnsPolicy: "ClusterFirst", | ||
| }, | ||
| }, | ||
| replicas: 1, | ||
| strategy: { type: "RollingUpdate", rollingUpdate: { maxUnavailable: 1, maxSurge: 1 } }, | ||
| revisionHistoryLimit: 3, | ||
| }, | ||
| }) | ||
| }) | ||
|
|
||
| it("should copy and reference imagePullSecrets", async () => { | ||
| const service = await graph.getService("simple-service") | ||
| const secretName = "test-docker-auth" | ||
|
|
||
| const authSecret: KubernetesResource<V1Secret> = { | ||
| apiVersion: "v1", | ||
| kind: "Secret", | ||
| type: "kubernetes.io/dockerconfigjson", | ||
| metadata: { | ||
| name: secretName, | ||
| namespace: "default", | ||
| }, | ||
| stringData: { | ||
| ".dockerconfigjson": JSON.stringify({ auths: {} }), | ||
| }, | ||
| } | ||
| await api.upsert({ kind: "Secret", namespace: "default", obj: authSecret, log: garden.log }) | ||
|
|
||
| const namespace = garden.projectName | ||
| const _provider = cloneDeep(provider) | ||
| _provider.config.imagePullSecrets = [{ name: secretName, namespace: "default" }] | ||
|
|
||
| const resource = await createWorkloadManifest({ | ||
| api, | ||
| provider: _provider, | ||
| service, | ||
| runtimeContext: emptyRuntimeContext, | ||
| namespace, | ||
| enableHotReload: false, | ||
| log: garden.log, | ||
| production: false, | ||
| }) | ||
|
|
||
| const copiedSecret = await api.core.readNamespacedSecret(secretName, namespace) | ||
| expect(copiedSecret).to.exist | ||
| expect(resource.spec.template.spec.imagePullSecrets).to.eql([{ name: secretName }]) | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters