Merge pull request #1 from rcarrillocruz/initial_import

Initial import

.gitignore

@@ -0,0 +1,22 @@
+# IDEs
+/.vscode
+/.settings
+*.swp
+.vimrc
+.DS_Store
+.idea
+*.go~
+
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+

Dockerfile

@@ -0,0 +1,8 @@
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
+WORKDIR /go/src/github.com/openshift/debug-network
+COPY . .
+ENV GO_PACKAGE github.com/openshift/debug-network
+
+FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:cli
+COPY --from=builder /go/src/github.com/openshift/debug-network/debug-scripts/* /usr/bin/
+

Dockerfile.rhel7

@@ -0,0 +1,8 @@
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
+WORKDIR /go/src/github.com/openshift/debug-network
+COPY . .
+ENV GO_PACKAGE github.com/openshift/debug-network
+
+FROM registry.svc.ci.openshift.org/ocp/4.6:cli
+COPY --from=builder /go/src/github.com/openshift/debug-network/debug-scripts/* /usr/bin/
+RUN yum -y install jq tcpdump traceroute net-tools nmap-ncat pciutils strace numactl; yum clean all

Makefile

@@ -0,0 +1,17 @@
+all: images
+.PHONY: all
+
+# Include the library makefile
+include $(addprefix ./vendor/github.com/openshift/library-go/alpha-build-machinery/make/, \
+	targets/openshift/images.mk \
+)
+
+IMAGE_REGISTRY :=registry.svc.ci.openshift.org
+
+# This will call a macro called "build-image" which will generate image specific targets based on the parameters:
+# $0 - macro name
+# $1 - target name
+# $2 - image ref
+# $3 - Dockerfile path
+# $4 - context directory for image build
+$(call build-image,ocp-debug-network,$(IMAGE_REGISTRY)/ocp/4.6:ocp-debug-network, ./Dockerfile.rhel7,.)

OWNERS

@@ -0,0 +1,4 @@
+reviewers:
+  - rcarrillocruz
+approvers:
+  - rcarrillocruz

README.md

@@ -0,0 +1,11 @@
+debug-network
+=============
+
+`openshift-debug-network` is a tool for debugging network.
+The directory structure, as well as specific details behind this tool can be found [in this enhancement](https://github.com/openshift/enhancements/blob/master/enhancements/oc/debug-network.md).
+
+## Debugging Scripts
+Debugging scripts are kept in `./debug-scripts`.  The content of that folder is placed in `/usr/bin` in the image.
+The debug network scripts should only include debug logic for OpenShift Networking.
+Outside components are encouraged to produce a similar "debug-network" image, but this is not the spot to be
+included.

debug-scripts/OWNERS

@@ -0,0 +1,4 @@
+reviewers:
+  - rcarrillocruz
+approvers:
+  - rcarrillocruz

debug-scripts/debug

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# generate /debug-network/version file
+. version
+echo "openshift/debug-network" > /debug-network/version
+version >> /debug-networking/version
+

debug-scripts/version

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+function version() {
+  # get version from image
+  version=$( \
+    oc status | grep '^pod' | \
+    sed -n -r -e 's/.*([[:digit:]]+\.[[:digit:]]+(:?\.[[:digit:]])?(:?-[^@]+)?).*/\1/p' \
+  )
+
+  # if version not found, fallback to imageID
+  [ -z "${version}" ] && version=$(oc status | grep '^pod.*runs' | sed -r -e 's/^pod.*runs //')
+
+  # if version still not found, use Unknown
+  [ -z "${version}" ] && version="Unknown"
+
+  echo ${version}
+}

go.mod

@@ -0,0 +1,25 @@
+module github.com/openshift/debug-networking
+
+go 1.14
+
+require (
+	github.com/Microsoft/hcsshim v0.8.9 // indirect
+	github.com/containerd/containerd v1.4.0 // indirect
+	github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe // indirect
+	github.com/containers/storage v1.23.4 // indirect
+	github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
+	github.com/fsouza/go-dockerclient v1.6.5 // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
+	github.com/openshift/imagebuilder v1.1.6 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect
+	github.com/sirupsen/logrus v1.6.0 // indirect
+	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
+	golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f // indirect
+	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
+	google.golang.org/grpc v1.31.1 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	k8s.io/klog v1.0.0 // indirect
+)

pkg/tools/tools.go

@@ -0,0 +1,7 @@
+// *build tools
+
+package tools
+
+import (
+	_ "github.com/openshift/library-go/alpha-build-machinery"
+)