Skip to content

Commit

Permalink
Merge pull request #149 from seungsoo-lee/master
Browse files Browse the repository at this point in the history
Updated dev-config
  • Loading branch information
seungsoo-lee committed May 31, 2021
2 parents c968b4b + 86164ba commit e581ef2
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 25 deletions.
26 changes: 6 additions & 20 deletions deployments/k8s/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,36 +1,22 @@
apiVersion: v1
kind: Service
metadata:
name: policy-discovery-service
labels:
service: policy-discovery-service
spec:
ports:
- port: 9089
targetPort: 9089
protocol: TCP
selector:
container: policy-discovery-service
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: policy-discovery-service
name: knoxautopolicy
labels:
deployment: policy-discovery-service
deployment: knoxautopolicy
spec:
selector:
matchLabels:
container: policy-discovery-service
container: knoxautopolicy
template:
metadata:
labels:
container: policy-discovery-service
container: knoxautopolicy
spec:
containers:
- image: gcr.io/accuknox/snapshot/knoxautopolicy:latest
#image: accuknox/knoxautopolicy:latest
name: policy-discovery-service
name: knoxautopolicy
ports:
- containerPort: 9089
protocol: TCP
Expand All @@ -41,5 +27,5 @@ spec:
volumes:
- name: config-volume
configMap:
name: policy-discovery-service-config
name: knoxautopolicy-config

2 changes: 1 addition & 1 deletion deployments/k8s/dev-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ data:
bootstrap-servers: "dev-kafka-kafka-bootstrap.accuknox-dev-kafka.svc.cluster.local:9092"
group-id: policy.cilium
topics:
- cilium-telemetry-test
- cilium-telemetry
- kubearmor-syslogs
ssl:
enabled: false
Expand Down
13 changes: 13 additions & 0 deletions deployments/k8s/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: knoxautopolicy
labels:
service: knoxautopolicy
spec:
ports:
- port: 9089
targetPort: 9089
protocol: TCP
selector:
container: knoxautopolicy
4 changes: 2 additions & 2 deletions src/build/Dockerfile.autopol
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ RUN go build -o knoxAutoPolicy main.go

### Make executable image

#FROM debian:buster
FROM artifactory.accuknox.com/accuknox/ubuntu:bionic-20210512
FROM debian:buster
#FROM artifactory.accuknox.com/accuknox/ubuntu:bionic-20210512

COPY conf/local.yaml conf/local.yaml
COPY --from=builder /usr/src/knox/knoxAutoPolicy /knoxAutoPolicy
Expand Down
2 changes: 1 addition & 1 deletion src/conf/local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ kafka:
bootstrap-servers: "dev-kafka-kafka-bootstrap.accuknox-dev-kafka.svc.cluster.local:9092"
group-id: policy.cilium
topics:
- cilium-telemetry-test
- cilium-telemetry
- kubearmor-syslogs
ssl:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion src/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ func main() {
// start autopolicy service
log.Info().Msgf("KnoxAutoPolicy gRPC server on %s port started", grpcserver.PortNumber)
if err := server.Serve(lis); err != nil {
log.Error().Msgf("failed to serve: %s", err)
log.Error().Msgf("Failed to serve: %v", err)
}
}

0 comments on commit e581ef2

Please sign in to comment.