Skip to content

Commit

Permalink
fixed review notes
Browse files Browse the repository at this point in the history
Signed-off-by: Achref Ben Saadd <[email protected]>
  • Loading branch information
achrefbensaad committed Apr 24, 2022
1 parent 6f699ef commit b762ba6
Show file tree
Hide file tree
Showing 14 changed files with 10 additions and 94 deletions.
1 change: 0 additions & 1 deletion pkg/KubeArmorAnnotation/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Binaries for programs and plugins
*.exe
*.exe~
Expand Down
2 changes: 1 addition & 1 deletion pkg/KubeArmorAnnotation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ FROM gcr.io/distroless/static
WORKDIR /
COPY --from=builder /workspace/manager .

ENTRYPOINT ["/manager"]
ENTRYPOINT ["/manager"]
3 changes: 1 addition & 2 deletions pkg/KubeArmorAnnotation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright 2021 Authors of KubeArmor

# Image URL to use all building/pushing image targets
IMG ?= controller:latest
IMG ?= kubearmor/kubearmor-annotation-manager:latest
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"

Expand Down Expand Up @@ -86,7 +86,6 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build config/default | kubectl delete -f -


CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ spec:
issuerRef:
kind: Issuer
name: selfsigned-issuer
secretName: webhook-server-cert
secretName: webhook-server-cert
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ resources:
- certificate.yaml

configurations:
- kustomizeconfig.yaml
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ varReference:
path: spec/commonName
- kind: Certificate
group: cert-manager.io
path: spec/dnsNames
path: spec/dnsNames
28 changes: 0 additions & 28 deletions pkg/KubeArmorAnnotation/config/samples/deployment.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions pkg/KubeArmorAnnotation/config/samples/pod.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions pkg/KubeArmorAnnotation/config/samples/policy.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/KubeArmorAnnotation/config/webhook/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ resources:
- service.yaml

configurations:
- kustomizeconfig.yaml
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ namespace:
create: true

varReference:
- path: metadata/annotations
- path: metadata/annotations
2 changes: 1 addition & 1 deletion pkg/KubeArmorAnnotation/config/webhook/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ spec:
protocol: TCP
targetPort: 9443
selector:
control-plane: controller-manager
control-plane: controller-manager
17 changes: 2 additions & 15 deletions pkg/KubeArmorAnnotation/hack/boilerplate.go.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,2 @@
/*
Copyright 2022.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// SPDX-License-Identifier: Apache-2.0
// Copyright 2021 Authors of KubeArmor
16 changes: 0 additions & 16 deletions pkg/KubeArmorAnnotation/main.go
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2021 Authors of KubeArmor

/*
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package main

import (
Expand Down

0 comments on commit b762ba6

Please sign in to comment.