Skip to content

Kubernetes Volumes #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
axisofentropy wants to merge 16 commits into
base: merge_2022-07
Choose a base branch
from
Open

Kubernetes Volumes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dc8c8f1
updated secrets logic
Mar 31, 2022
d08c145
removed resources
Mar 31, 2022
2939417
Small changes to update this branch.
axisofentropy Jun 27, 2022
369df28
Merge branch 'lengthen_network_checks' into merge_2022-07
axisofentropy Jun 27, 2022
6aa99eb
update `Makefile` to use newer `docker compose`.
axisofentropy May 5, 2022
0ea9ff3
Do not specify Ingress `secretName` if no `ClusterIssuer` is specified.
axisofentropy May 5, 2022
60951cc
Merge branch 'develop' into merge_2022-07
axisofentropy Jun 27, 2022
e4cc51e
Restore new secrets handling lost in previous merge commit.
axisofentropy Jun 27, 2022
03eb33c
Update settings in prep for big #1191 patch.
axisofentropy Jun 28, 2022
15b34a2
Added awaiting a rolling update and other improvements.
vasiliy-dbp Dec 24, 2021
72ef564
Add basic auth nginx config to Ingress
evgeny-agafonov Jun 7, 2022
3216655
refactor
evgeny-agafonov Jun 15, 2022
de4560b
Add support named volumes
evgeny-agafonov Jun 21, 2022
3ce75de
Add file missed from previous commit de4560b8faa3c37ae22c1d8a6394a09b…
axisofentropy Jun 29, 2022
dda3dfb
add anonymous volumes
evgeny-agafonov Jun 23, 2022
bace8d4
add remove unused pvc
evgeny-agafonov Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ NO_COLOR='\033[0m'
clean_world: destroy_shell build_shell up

destroy_shell:
docker-compose down -v
docker compose down -v

build_shell:
docker-compose build
docker compose build

up:
docker-compose up
docker compose up

shell:
docker-compose run --service-ports --rm controller bash
docker compose run --service-ports --rm controller bash

lint:
golangci-lint run
Expand Down
6 changes: 5 additions & 1 deletion configs/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,16 @@ base: &base
startup_probe_failure_threshold: ${STARTUP_PROBE_FAILURE_THRESHOLD:-80}
startup_probe_period_seconds: ${STARTUP_PROBE_PERIOD_SECONDS:-15}
ephemeral_storage_coefficient: ${EPHEMERAL_STORAGE_COEFFICIENT:-1.9}
cert_manager_cluster_issuer: ${CERT_MANAGER_CLUSTER_ISSUER:-letsencrypt}
cert_manager_cluster_issuer: ${CERT_MANAGER_CLUSTER_ISSUER:-}
sandbox_enabled: ${SANDBOX_ENABLED}
ingress_default_port: 443
pvc_storage_class_name: uffizzi-standard
service_checks:
ip_ping_timeout: 1800s
availability_timeout: 1800s
await_status_timeout: 1800s
await_rolling_update_timeout: 900s
step_awaiting_rolling_update: 6s
per_address_attempts: 180
per_address_timeout: 1800s

Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ require (
)

require (
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
Expand All @@ -42,6 +43,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaaSyd+DyQRrsQjhbSeS7qe4nEw8aQw=
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo=
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
Expand Down Expand Up @@ -371,6 +373,8 @@ github.com/swaggo/http-swagger v1.2.5 h1:iDWoHpJMLNo4nwGOPXsOoqlB9wB6M4xgjhws8x3
github.com/swaggo/http-swagger v1.2.5/go.mod h1:CcoICgY3yVDk2u1LQUCMHbAj0fjlxIX+873psXlIKNA=
github.com/swaggo/swag v1.7.9 h1:6vCG5mm43ebDzGlZPMGYrYI4zKFfOr5kicQX8qjeDwc=
github.com/swaggo/swag v1.7.9/go.mod h1:gZ+TJ2w/Ve1RwQsA2IRoSOTidHz6DX+PIG8GWvbnoLU=
github.com/tg123/go-htpasswd v1.2.0 h1:UKp34m9H467/xklxUxU15wKRru7fwXoTojtxg25ITF0=
github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJYLlEUJa2sM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down Expand Up @@ -405,6 +409,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand All @@ -415,6 +420,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down
41 changes: 16 additions & 25 deletions internal/clients/kuber/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,13 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
)

func prepareContainerEnvironmentVariables(container domainTypes.Container) []corev1.EnvVar {
var variables []corev1.EnvVar

for _, variable := range container.Variables {
newVariable := corev1.EnvVar{Name: variable.Name, Value: variable.Value}
variables = append(variables, newVariable)
}

for _, secretVariable := range container.SecretVariables {
newSectetVariable := corev1.EnvVar{Name: secretVariable.Name, Value: secretVariable.Value}
variables = append(variables, newSectetVariable)
}

return variables
}

func (client *Client) FindDeployment(namespaceName, name string) (*appsv1.Deployment, error) {
deployments := client.clientset.AppsV1().Deployments(namespaceName)

return deployments.Get(client.context, name, metav1.GetOptions{})
}

func (client *Client) findOrInitializeDeployment(namespace *corev1.Namespace, deploymentName, deploymentSelectorName string) (*appsv1.Deployment, error) {
func (client *Client) findOrInitializeDeployment(namespace *corev1.Namespace, deploymentName string) (*appsv1.Deployment, error) {
deployments := client.clientset.AppsV1().Deployments(namespace.Name)

deployment, err := deployments.Get(client.context, deploymentName, metav1.GetOptions{})
Expand All @@ -47,7 +31,7 @@ func (client *Client) findOrInitializeDeployment(namespace *corev1.Namespace, de
}

if len(deployment.UID) == 0 {
deployment = initializeDeployment(namespace, deploymentName, deploymentSelectorName)
deployment = initializeDeployment(namespace, deploymentName)
}

return deployment, nil
Expand Down Expand Up @@ -96,7 +80,6 @@ func (client *Client) updateDeploymentAttributes(
namespace *corev1.Namespace,
deployment *appsv1.Deployment,
containerList domainTypes.ContainerList,
resources []domainTypes.Resource,
) (*appsv1.Deployment, error) {
var containers []corev1.Container

Expand Down Expand Up @@ -151,6 +134,16 @@ func (client *Client) updateDeploymentAttributes(
corev1.ResourceCPU: *podCpuLimit,
}

name := global.Settings.ResourceName.ContainerSecret(draftContainer.ID)
secret, err := client.GetSecret(namespace.Name, name)

if err != nil && !errors.IsNotFound(err) {
return nil, err
}

containerVariables := prepareContainerEnvironmentVariables(draftContainer)
containerSecrets := prepareContainerSecrets(draftContainer, secret)

container := corev1.Container{
Name: draftContainer.ControllerName,
Image: containerImage,
Expand All @@ -160,8 +153,7 @@ func (client *Client) updateDeploymentAttributes(
Requests: requests,
Limits: limits,
},
Env: prepareContainerEnvironmentVariables(draftContainer),
EnvFrom: prepareEnvFromResources(resources),
Env: append(containerVariables, containerSecrets...),
VolumeMounts: prepareContainerVolumeMounts(draftContainer),
LivenessProbe: prepareContainerHealthcheck(draftContainer),
}
Expand Down Expand Up @@ -198,19 +190,18 @@ func (client *Client) updateDeploymentAttributes(

func (client *Client) CreateOrUpdateDeployments(
namespace *corev1.Namespace,
deploymentName, deploymentSelectorName string,
deploymentName string,
containerList domainTypes.ContainerList,
credentials []domainTypes.Credential,
resources []domainTypes.Resource,
) (*appsv1.Deployment, error) {
deployments := client.clientset.AppsV1().Deployments(namespace.Name)

deployment, err := client.findOrInitializeDeployment(namespace, deploymentName, deploymentSelectorName)
deployment, err := client.findOrInitializeDeployment(namespace, deploymentName)
if err != nil {
return nil, err
}

deployment, err = client.updateDeploymentAttributes(namespace, deployment, containerList, resources)
deployment, err = client.updateDeploymentAttributes(namespace, deployment, containerList)
if err != nil {
return nil, err
}
Expand Down
Loading