Skip to content

Commit

Permalink
Revert "Upgrading kubernetes client library to v24.2.0"
Browse files Browse the repository at this point in the history
  • Loading branch information
@gmdfalk
gmdfalk authored Jul 10, 2023
1 parent 70092c5 commit 1c43c9c
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 63 deletions.
24 changes: 12 additions & 12 deletions paasta_tools/kubernetes_tools.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
from humanfriendly import parse_size
from kubernetes import client as kube_client
from kubernetes import config as kube_config
from kubernetes.client import CoreV1Event
from kubernetes.client import models
from kubernetes.client import V1Affinity
from kubernetes.client import V1AWSElasticBlockStoreVolumeSource
from kubernetes.client import V1beta1CustomResourceDefinition
from kubernetes.client import V1beta1PodDisruptionBudget
from kubernetes.client import V1beta1PodDisruptionBudgetSpec
from kubernetes.client import V1Capabilities
Expand All @@ -55,21 +55,21 @@
from kubernetes.client import V1ContainerPort
from kubernetes.client import V1ContainerStatus
from kubernetes.client import V1ControllerRevision
from kubernetes.client import V1CustomResourceDefinition
from kubernetes.client import V1CustomResourceDefinitionList
from kubernetes.client import V1DeleteOptions
from kubernetes.client import V1Deployment
from kubernetes.client import V1DeploymentSpec
from kubernetes.client import V1DeploymentStrategy
from kubernetes.client import V1EnvVar
from kubernetes.client import V1EnvVarSource
from kubernetes.client import V1Event
from kubernetes.client import V1ExecAction
from kubernetes.client import V1Handler
from kubernetes.client import V1HostPathVolumeSource
from kubernetes.client import V1HTTPGetAction
from kubernetes.client import V1KeyToPath
from kubernetes.client import V1LabelSelector
from kubernetes.client import V1Lifecycle
from kubernetes.client import V1LifecycleHandler
from kubernetes.client import V1Namespace
from kubernetes.client import V1Node
from kubernetes.client import V1NodeAffinity
Expand Down Expand Up @@ -525,7 +525,7 @@ def __init__(
self.deployments = kube_client.AppsV1Api(self.api_client)
self.core = kube_client.CoreV1Api(self.api_client)
self.policy = kube_client.PolicyV1beta1Api(self.api_client)
self.apiextensions = kube_client.ApiextensionsV1Api(self.api_client)
self.apiextensions = kube_client.ApiextensionsV1beta1Api(self.api_client)
self.custom = kube_client.CustomObjectsApi(self.api_client)
self.autoscaling = kube_client.AutoscalingV2beta2Api(self.api_client)
self.rbac = kube_client.RbacAuthorizationV1Api(self.api_client)
Expand Down Expand Up @@ -1025,7 +1025,7 @@ def get_hacheck_sidecar_container(
return V1Container(
image=system_paasta_config.get_hacheck_sidecar_image_url(),
lifecycle=V1Lifecycle(
pre_stop=V1LifecycleHandler(
pre_stop=V1Handler(
_exec=V1ExecAction(
command=[
"/bin/sh",
Expand Down Expand Up @@ -1067,7 +1067,7 @@ def get_uwsgi_exporter_sidecar_container(
env=self.get_kubernetes_environment() + [stats_port_env],
ports=[V1ContainerPort(container_port=9117)],
lifecycle=V1Lifecycle(
pre_stop=V1LifecycleHandler(
pre_stop=V1Handler(
_exec=V1ExecAction(
command=[
"/bin/sh",
Expand Down Expand Up @@ -1377,20 +1377,20 @@ def get_readiness_probe(
else:
return self.get_liveness_probe(service_namespace_config)

def get_kubernetes_container_termination_action(self) -> V1LifecycleHandler:
def get_kubernetes_container_termination_action(self) -> V1Handler:
command = self.config_dict.get("lifecycle", KubeLifecycleDict({})).get(
"pre_stop_command", []
)
# default pre stop hook for the container
if not command:
return V1LifecycleHandler(
return V1Handler(
_exec=V1ExecAction(
command=["/bin/sh", "-c", f"sleep {DEFAULT_PRESTOP_SLEEP_SECONDS}"]
)
)
if isinstance(command, str):
command = [command]
return V1LifecycleHandler(_exec=V1ExecAction(command=command))
return V1Handler(_exec=V1ExecAction(command=command))

def get_pod_volumes(
self,
Expand Down Expand Up @@ -3294,7 +3294,7 @@ def update_stateful_set(
)


def get_event_timestamp(event: CoreV1Event) -> Optional[float]:
def get_event_timestamp(event: V1Event) -> Optional[float]:
# Cycle through timestamp attributes in order of preference
for ts_attr in ["last_timestamp", "event_time", "first_timestamp"]:
ts = getattr(event, ts_attr)
Expand All @@ -3309,7 +3309,7 @@ async def get_events_for_object(
obj: Union[V1Pod, V1Deployment, V1StatefulSet, V1ReplicaSet],
kind: str, # for some reason, obj.kind isn't populated when this function is called so we pass it in by hand
max_age_in_seconds: Optional[int] = None,
) -> List[CoreV1Event]:
) -> List[V1Event]:

try:
# this is a blocking call since it does network I/O and can end up significantly blocking the
Expand Down Expand Up @@ -3800,7 +3800,7 @@ def mode_to_int(mode: Optional[Union[str, int]]) -> Optional[int]:

def update_crds(
kube_client: KubeClient,
desired_crds: Collection[V1CustomResourceDefinition],
desired_crds: Collection[V1beta1CustomResourceDefinition],
existing_crds: V1CustomResourceDefinitionList,
) -> bool:
success = True
Expand Down
4 changes: 2 additions & 2 deletions paasta_tools/setup_kubernetes_crd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from typing import Sequence

import service_configuration_lib
from kubernetes.client import V1CustomResourceDefinition
from kubernetes.client import V1beta1CustomResourceDefinition

from paasta_tools.kubernetes_tools import KubeClient
from paasta_tools.kubernetes_tools import paasta_prefixed
Expand Down Expand Up @@ -118,7 +118,7 @@ def setup_kube_crd(
metadata["labels"] = {}
metadata["labels"]["yelp.com/paasta_service"] = service
metadata["labels"][paasta_prefixed("service")] = service
desired_crd = V1CustomResourceDefinition(
desired_crd = V1beta1CustomResourceDefinition(
api_version=crd_config.get("apiVersion"),
kind=crd_config.get("kind"),
metadata=metadata,
Expand Down
70 changes: 29 additions & 41 deletions paasta_tools/setup_kubernetes_internal_crd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import logging
import sys

from kubernetes.client import V1CustomResourceDefinition
from kubernetes.client import V1beta1CustomResourceDefinition

from paasta_tools.kubernetes_tools import KubeClient
from paasta_tools.kubernetes_tools import paasta_prefixed
Expand All @@ -33,8 +33,8 @@


INTERNAL_CRDS = [
V1CustomResourceDefinition(
api_version="apiextensions.k8s.io/v1",
V1beta1CustomResourceDefinition(
api_version="apiextensions.k8s.io/v1beta1",
kind="CustomResourceDefinition",
metadata={
"name": "deploygroups.paasta.yelp.com",
Expand All @@ -44,35 +44,29 @@
},
spec={
"group": "paasta.yelp.com",
"versions": [
{
"name": "v1beta1",
"served": True,
"storage": True,
"schema": {
"openAPIV3Schema": {
"type": "object",
"properties": {
"service": {"type": "string"},
"deploy_group": {"type": "string"},
"git_sha": {"type": "string"},
"image_version": {"type": "string"},
},
}
},
}
],
"versions": [{"name": "v1beta1", "served": True, "storage": True}],
"scope": "Namespaced",
"names": {
"plural": "deploygroups",
"singular": "deploygroup",
"kind": "DeployGroup",
"shortNames": ["dg"],
},
"validation": {
"openAPIV3Schema": {
"type": "object",
"properties": {
"service": {"type": "string"},
"deploy_group": {"type": "string"},
"git_sha": {"type": "string"},
"image_version": {"type": "string"},
},
}
},
},
),
V1CustomResourceDefinition(
api_version="apiextensions.k8s.io/v1",
V1beta1CustomResourceDefinition(
api_version="apiextensions.k8s.io/v1beta1",
kind="CustomResourceDefinition",
metadata={
"name": "startstopcontrols.paasta.yelp.com",
Expand All @@ -82,30 +76,24 @@
},
spec={
"group": "paasta.yelp.com",
"versions": [
{
"name": "v1beta1",
"served": True,
"storage": True,
"schema": {
"openAPIV3Schema": {
"type": "object",
"properties": {
"service": {"type": "string"},
"instance": {"type": "string"},
"desired_state": {"type": "string"},
"force_bounce": {"type": "string"},
},
}
},
}
],
"versions": [{"name": "v1beta1", "served": True, "storage": True}],
"scope": "Namespaced",
"names": {
"plural": "startstopcontrols",
"singular": "startstopcontrol",
"kind": "StartStopControl",
},
"validation": {
"openAPIV3Schema": {
"type": "object",
"properties": {
"service": {"type": "string"},
"instance": {"type": "string"},
"desired_state": {"type": "string"},
"force_bounce": {"type": "string"},
},
}
},
},
),
]
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jmespath==0.9.3
jsonref==0.1
jsonschema==2.5.1
kazoo==2.8.0
kubernetes==24.2.0
kubernetes==18.20.0
ldap3==2.6
manhole==1.5.0
marathon==0.12.0
Expand Down
14 changes: 7 additions & 7 deletions tests/test_kubernetes_tools.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
from kubernetes.client import V1EnvVar
from kubernetes.client import V1EnvVarSource
from kubernetes.client import V1ExecAction
from kubernetes.client import V1Handler
from kubernetes.client import V1HostPathVolumeSource
from kubernetes.client import V1HTTPGetAction
from kubernetes.client import V1KeyToPath
from kubernetes.client import V1LabelSelector
from kubernetes.client import V1Lifecycle
from kubernetes.client import V1LifecycleHandler
from kubernetes.client import V1NodeAffinity
from kubernetes.client import V1NodeSelector
from kubernetes.client import V1NodeSelectorRequirement
Expand Down Expand Up @@ -559,7 +559,7 @@ def test_get_sidecar_containers(self):
],
image="some-docker-image",
lifecycle=V1Lifecycle(
pre_stop=V1LifecycleHandler(
pre_stop=V1Handler(
_exec=V1ExecAction(
command=[
"/bin/sh",
Expand Down Expand Up @@ -605,7 +605,7 @@ def test_get_sidecar_containers(self):
],
image="some-docker-image",
lifecycle=V1Lifecycle(
pre_stop=V1LifecycleHandler(
pre_stop=V1Handler(
_exec=V1ExecAction(
command=[
"/bin/sh",
Expand Down Expand Up @@ -1005,7 +1005,7 @@ def test_get_kubernetes_containers(self, prometheus_port, expected_ports):
resources=mock_get_resource_requirements.return_value,
image=mock_get_docker_url.return_value,
lifecycle=V1Lifecycle(
pre_stop=V1LifecycleHandler(
pre_stop=V1Handler(
_exec=V1ExecAction(command=["/bin/sh", "-c", "sleep 30"])
)
),
Expand Down Expand Up @@ -1949,7 +1949,7 @@ def test_kubernetes_container_termination_action(
self.deployment.config_dict["lifecycle"] = {
"pre_stop_command": termination_action
}
handler = V1LifecycleHandler(_exec=V1ExecAction(command=expected))
handler = V1Handler(_exec=V1ExecAction(command=expected))
assert self.deployment.get_kubernetes_container_termination_action() == handler

@pytest.mark.parametrize(
Expand Down Expand Up @@ -3965,7 +3965,7 @@ def test_warning_big_bounce():
job_config.format_kubernetes_app().spec.template.metadata.labels[
"paasta.yelp.com/config_sha"
]
== "configd6531f39"
== "configf6939dba"
), "If this fails, just change the constant in this test, but be aware that deploying this change will cause every service to bounce!"


Expand Down Expand Up @@ -4011,7 +4011,7 @@ def test_warning_big_bounce_routable_pod():
job_config.format_kubernetes_app().spec.template.metadata.labels[
"paasta.yelp.com/config_sha"
]
== "configa5abd828"
== "config0107126a"
), "If this fails, just change the constant in this test, but be aware that deploying this change will cause every smartstack-registered service to bounce!"


Expand Down

0 comments on commit 1c43c9c

Please sign in to comment.