Skip to content
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

Add support for ReplicaSet k8s kind #152

Merged
merged 14 commits into from
Jul 20, 2022
Merged

Add support for ReplicaSet k8s kind #152

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8939c58
support ReplicaSet
anastasia-malysheva Jun 10, 2022
c9ef8c5
remove redundant switch
anastasia-malysheva Jun 15, 2022
2f22dca
return switch back and update, update rules for selfRegister
anastasia-malysheva Jun 16, 2022
0c5016d
Fix processing of deployment resources
anastasia-malysheva Jun 16, 2022
ce2d6a3
add import
anastasia-malysheva Jun 16, 2022
9c8733a
add import
anastasia-malysheva Jun 16, 2022
3131c88
check tracing disable
anastasia-malysheva Jul 7, 2022
ddf76f5
Merge method back in one
anastasia-malysheva Jul 11, 2022
2dccc62
import fix
anastasia-malysheva Jul 11, 2022
951d0e4
remove redundant logs.
anastasia-malysheva Jul 12, 2022
ead9483
fixes after comments
anastasia-malysheva Jul 12, 2022
d7709e4
fixes after comments
anastasia-malysheva Jul 13, 2022
d3b2f29
fixes after comments
anastasia-malysheva Jul 18, 2022
c5c4f45
fixes after comments
anastasia-malysheva Jul 19, 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
26 changes: 25 additions & 1 deletion internal/k8s/selfregister.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,35 @@ func (a *AdmissionWebhookRegisterClient) Register(ctx context.Context, c *config
{
Operations: []admissionv1.OperationType{admissionv1.Create, admissionv1.Update},
Rule: admissionv1.Rule{
APIGroups: []string{"extensions"},
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"deployments"},
},
},
{
Operations: []admissionv1.OperationType{admissionv1.Create, admissionv1.Update},
Rule: admissionv1.Rule{
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"statefulsets"},
},
},
{
Operations: []admissionv1.OperationType{admissionv1.Create, admissionv1.Update},
Rule: admissionv1.Rule{
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"daemonsets"},
},
},
{
Operations: []admissionv1.OperationType{admissionv1.Create, admissionv1.Update},
Rule: admissionv1.Rule{
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"replicasets"},
},
},
},
SideEffects: &sideEffects,
AdmissionReviewVersions: []string{"v1"},
Expand Down
55 changes: 43 additions & 12 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ type admissionWebhookServer struct {
logger *zap.SugaredLogger
}

const (
deploymentKind string = "Deployment"
podKind string = "Pod"
replicaSetKind string = "ReplicaSet"
)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const (
deploymentKind string = "Deployment"
podKind string = "Pod"
replicaSetKind string = "ReplicaSet"
)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anastasia-malysheva Could you please resolve this comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@denis-tingaikin I took a look to the k8s doc and couldn't find constants for this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@denis-tingaikin I changed linter setting and removed constants

func (s *admissionWebhookServer) Review(in *admissionv1.AdmissionRequest) *admissionv1.AdmissionResponse {
var resp = &admissionv1.AdmissionResponse{
UID: in.UID,
Expand Down Expand Up @@ -100,43 +106,68 @@ func (s *admissionWebhookServer) Review(in *admissionv1.AdmissionRequest) *admis

func (s *admissionWebhookServer) unmarshal(in *admissionv1.AdmissionRequest) (p string, meta *v1.ObjectMeta, spec *corev1.PodSpec) {
var podSpec *corev1.PodSpec
var metaPtr *v1.ObjectMeta
var metaPtr, podMetaPtr *v1.ObjectMeta
var target interface{}
p = "/spec/template"
switch in.Kind.Kind {
case "Deployment":
case deploymentKind:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
case deploymentKind:
case "Deployment":

var deployment appsv1.Deployment
metaPtr = &deployment.Spec.Template.ObjectMeta
metaPtr = &deployment.ObjectMeta
podMetaPtr = &deployment.Spec.Template.ObjectMeta
podSpec = &deployment.Spec.Template.Spec
target = &deployment
case "Pod":
case podKind:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
case podKind:
case "Pod":

var pod corev1.Pod
p = ""
metaPtr = &pod.ObjectMeta
podMetaPtr = &pod.ObjectMeta
podSpec = &pod.Spec
target = &pod
case "DaemonSet":
var daemonSet appsv1.DaemonSet
metaPtr = &daemonSet.Spec.Template.ObjectMeta
metaPtr = &daemonSet.ObjectMeta
podMetaPtr = &daemonSet.Spec.Template.ObjectMeta
podSpec = &daemonSet.Spec.Template.Spec
target = &daemonSet
case "StatefulSet":
var statefulSet appsv1.StatefulSet
metaPtr = &statefulSet.Spec.Template.ObjectMeta
metaPtr = &statefulSet.ObjectMeta
podMetaPtr = &statefulSet.Spec.Template.ObjectMeta
podSpec = &statefulSet.Spec.Template.Spec
target = &statefulSet
case replicaSetKind:
var replicaSet appsv1.ReplicaSet
metaPtr = &replicaSet.ObjectMeta
podMetaPtr = &replicaSet.Spec.Template.ObjectMeta
podSpec = &replicaSet.Spec.Template.Spec
target = &replicaSet
defer func() {
s.logger.Info("Replicaset Defer method")
for _, o := range metaPtr.OwnerReferences {
if o.Kind == deploymentKind {
p, meta, spec = "", nil, nil
}
}
}()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still looking overcomplicated.

I think the main problem here that we are doing things in unmarshal method that actually doesnt related to the operation.

Please move all 'post unmarshal' changes into separate method and use it right afiter unmarshal in the Review function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added changes, please take a look


default:
return "", nil, nil
}

if err := json.Unmarshal(in.Object.Raw, target); err != nil {
return "", nil, nil
}
p = path.Join("/", p)
if metaPtr.Labels == nil {
metaPtr.Labels = make(map[string]string)
if podMetaPtr.Labels == nil {
podMetaPtr.Labels = make(map[string]string)
}
return p, metaPtr, podSpec
// Annotations shouldn't be applied second time.
if in.Kind.Kind != podKind && metaPtr.Annotations != nil {
if podMetaPtr.Annotations == nil {
podMetaPtr.Annotations = metaPtr.Annotations
} else {
s.logger.Errorf("Malformed specification. Annotations can't be provided in several places.")
}
}

return path.Join("/", p), podMetaPtr, podSpec
}

func (s *admissionWebhookServer) createVolumesPatch(p string, volumes []corev1.Volume) jsonpatch.JsonPatchOperation {
Expand Down