Skip to content

Commit 1a49306

Browse files
swastik959swastik959
committed
update
Signed-off-by: swastik959 <Sswastik959@gmail.com>
1 parent efdb267 commit 1a49306

7 files changed

Lines changed: 0 additions & 619 deletions

File tree

‎Dockerfile.dapper‎

Lines changed: 0 additions & 334 deletions
Large diffs are not rendered by default.

‎internal/k8s/main.go‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,38 +72,6 @@ func GetNodeIPs(kubeClient clientset.Interface, name string, useInternalIP bool)
7272
}
7373

7474
return externalIPs
75-
<<<<<<< HEAD
76-
=======
77-
=======
78-
if node.Annotations != nil {
79-
if annotatedIP := node.Annotations[externalAddressAnnotation]; annotatedIP != "" {
80-
return annotatedIP
81-
}
82-
if annotatedIP := node.Annotations[internalAddressAnnotation]; annotatedIP != "" {
83-
return annotatedIP
84-
}
85-
}
86-
87-
if node.Annotations != nil {
88-
if annotatedIP := node.Annotations[externalAddressAnnotation]; annotatedIP != "" {
89-
return annotatedIP
90-
}
91-
if annotatedIP := node.Annotations[internalAddressAnnotation]; annotatedIP != "" {
92-
return annotatedIP
93-
}
94-
}
95-
96-
for _, address := range node.Status.Addresses {
97-
if address.Type == apiv1.NodeExternalIP {
98-
if address.Address != "" {
99-
return address.Address
100-
}
101-
}
102-
}
103-
104-
return defaultOrInternalIP
105-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
106-
>>>>>>> 979f2b269 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
10775
}
10876

10977
var (

‎scripts/build‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,60 +13,5 @@ mkdir -p bin
1313
declare -a arches=("arm64" "amd64")
1414
for arch in "${arches[@]}"
1515
do
16-
<<<<<<< HEAD
17-
<<<<<<< HEAD
18-
<<<<<<< HEAD
19-
<<<<<<< HEAD
20-
<<<<<<< HEAD
2116
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
22-
=======
23-
=======
24-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
25-
=======
26-
<<<<<<< HEAD
27-
<<<<<<< HEAD
28-
<<<<<<< HEAD
29-
<<<<<<< HEAD
30-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
31-
=======
32-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
33-
ARCH=$arch DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
34-
>>>>>>> a98f9bc1e ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
35-
=======
36-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
37-
>>>>>>> 7c3a753d9 ((cherry-pick) add Rancher's workflow files and add FOSSA)
38-
<<<<<<< HEAD
39-
<<<<<<< HEAD
40-
=======
41-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
42-
=======
43-
ARCH=$arch DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
44-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
45-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
46-
=======
47-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
48-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
49-
=======
50-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
51-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
52-
=======
53-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
54-
=======
55-
=======
56-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
57-
=======
58-
ARCH=$arch DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
59-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
60-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
61-
<<<<<<< HEAD
62-
>>>>>>> 979f2b269 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
63-
<<<<<<< HEAD
64-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
65-
=======
66-
=======
67-
=======
68-
ARCH="$arch" TAG="$TAG" DOCKER_IN_DOCKER_ENABLED=true USER=0 make build
69-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
70-
>>>>>>> fc5b2a779 ((cherry-pick) go generate and validate changes)
71-
>>>>>>> 3b008b0e1 ((cherry-pick) go generate and validate changes)
7217
done

‎scripts/package‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,78 +7,6 @@ source $(dirname $0)/version
77
cd $(dirname $0)/..
88

99
# manifest push happens as part of make release, so login is required inside the dapper container
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
<<<<<<< HEAD
13-
<<<<<<< HEAD
14-
<<<<<<< HEAD
15-
=======
16-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
17-
=======
18-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
1910
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
2011

2112
REGISTRY=${REPO} PLATFORMS="arm64 amd64" BUILDX_PLATFORMS="linux/amd64,linux/arm64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
22-
=======
23-
<<<<<<< HEAD
24-
echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin
25-
26-
REGISTRY=${REPO} PLATFORMS="arm64 amd64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
27-
<<<<<<< HEAD
28-
=======
29-
<<<<<<< HEAD
30-
<<<<<<< HEAD
31-
<<<<<<< HEAD
32-
<<<<<<< HEAD
33-
=======
34-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
35-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
36-
37-
REGISTRY=${REPO} PLATFORMS="arm64 amd64" BUILDX_PLATFORMS="linux/amd64,linux/arm64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
38-
=======
39-
echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin
40-
41-
REGISTRY=${REPO} PLATFORMS="arm64 amd64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
42-
<<<<<<< HEAD
43-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
44-
=======
45-
<<<<<<< HEAD
46-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
47-
>>>>>>> a98f9bc1e ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
48-
=======
49-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
50-
51-
REGISTRY=${REPO} PLATFORMS="arm64 amd64" BUILDX_PLATFORMS="linux/amd64,linux/arm64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
52-
>>>>>>> 7c3a753d9 ((cherry-pick) add Rancher's workflow files and add FOSSA)
53-
<<<<<<< HEAD
54-
<<<<<<< HEAD
55-
=======
56-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
57-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
58-
=======
59-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
60-
61-
REGISTRY=${REPO} PLATFORMS="arm64 amd64" BUILDX_PLATFORMS="linux/amd64,linux/arm64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
62-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
63-
=======
64-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
65-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
66-
=======
67-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
68-
=======
69-
=======
70-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
71-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
72-
<<<<<<< HEAD
73-
>>>>>>> 979f2b269 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
74-
<<<<<<< HEAD
75-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
76-
=======
77-
=======
78-
=======
79-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
80-
81-
REGISTRY=${REPO} PLATFORMS="arm64 amd64" BUILDX_PLATFORMS="linux/amd64,linux/arm64" TAG=${TAG} DOCKER_IN_DOCKER_ENABLED=true USER=0 make release
82-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
83-
>>>>>>> fc5b2a779 ((cherry-pick) go generate and validate changes)
84-
>>>>>>> 3b008b0e1 ((cherry-pick) go generate and validate changes)

‎scripts/test‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,5 @@ if [ "$(go env GOHOSTOS)" = "darwin" ]; then
1010
FIND_COMMAND="find ."
1111
fi
1212

13-
<<<<<<< HEAD
14-
<<<<<<< HEAD
15-
<<<<<<< HEAD
16-
<<<<<<< HEAD
17-
<<<<<<< HEAD
1813
PACKAGES="$($FIND_COMMAND -name '*.go' | xargs -I{} dirname {} | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|docs|test|controller/store|images|examples|hack|magefiles)')"
19-
=======
20-
PACKAGES="$($FIND_COMMAND -name '*.go' | xargs -I{} dirname {} | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|docs|test|controller/store|images|examples|hack)')"
21-
22-
>>>>>>> a98f9bc1e ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
23-
=======
24-
PACKAGES="$($FIND_COMMAND -name '*.go' | xargs -I{} dirname {} | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|docs|test|controller/store|images|examples|hack)')"
25-
26-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
27-
=======
28-
PACKAGES="$($FIND_COMMAND -name '*.go' | xargs -I{} dirname {} | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|docs|test|controller/store|images|examples|hack|magefiles)')"
29-
>>>>>>> bb9a3dea7 ([nginx-1.14.x-fix] fixes)
30-
=======
31-
PACKAGES="$($FIND_COMMAND -name '*.go' | xargs -I{} dirname {} | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|docs|test|controller/store|images|examples|hack)')"
32-
33-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
34-
=======
35-
PACKAGES="$($FIND_COMMAND -name '*.go' | xargs -I{} dirname {} | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|docs|test|controller/store|images|examples|hack|magefiles)')"
36-
>>>>>>> 7856a9f8d ([nginx-1.14.x-fix] fixes)
3714
go test -v -p 1 -tags "cgo" -cover ${PACKAGES}

‎scripts/validate‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,7 @@ cd $(dirname $0)/..
55

66
echo Running validation
77

8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
118
PACKAGES="$(go list ./... | grep -v /vendor/ | grep -v magefiles)"
12-
=======
13-
=======
14-
PACKAGES="$(go list ./... | grep -v /vendor/ | grep -v magefiles)"
15-
=======
16-
<<<<<<< HEAD
17-
<<<<<<< HEAD
18-
PACKAGES="$(go list ./... | grep -v /vendor/ | grep -v magefiles)"
19-
=======
20-
>>>>>>> 7856a9f8d ([nginx-1.14.x-fix] fixes)
21-
PACKAGES="$(go list ./... | grep -v /vendor/)"
22-
23-
>>>>>>> a98f9bc1e ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
24-
=======
25-
PACKAGES="$(go list ./... | grep -v /vendor/ | grep -v magefiles)"
26-
>>>>>>> bb9a3dea7 ([nginx-1.14.x-fix] fixes)
27-
<<<<<<< HEAD
28-
=======
29-
>>>>>>> 4a2ca42d0 ([nginx-1.14.x-fix] fixes)
30-
>>>>>>> 7856a9f8d ([nginx-1.14.x-fix] fixes)
319
echo Running: go vet
3210
go vet -mod=readonly ${PACKAGES}
3311

‎scripts/version‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -29,90 +29,9 @@ fi
2929
TAG=${TAG:-$VERSION}
3030

3131
PKG="k8s.io/ingress-nginx"
32-
<<<<<<< HEAD
33-
<<<<<<< HEAD
34-
<<<<<<< HEAD
35-
=======
36-
=======
37-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
38-
<<<<<<< HEAD
39-
<<<<<<< HEAD
40-
<<<<<<< HEAD
41-
<<<<<<< HEAD
42-
=======
43-
>>>>>>> 7c3a753d9 ((cherry-pick) add Rancher's workflow files and add FOSSA)
44-
<<<<<<< HEAD
45-
<<<<<<< HEAD
46-
=======
47-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
48-
=======
49-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
50-
=======
51-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
52-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
53-
=======
54-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
55-
=======
56-
=======
57-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
58-
<<<<<<< HEAD
59-
>>>>>>> 979f2b269 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
60-
<<<<<<< HEAD
61-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
62-
=======
63-
=======
64-
=======
65-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
66-
>>>>>>> fc5b2a779 ((cherry-pick) go generate and validate changes)
67-
>>>>>>> 3b008b0e1 ((cherry-pick) go generate and validate changes)
6832

6933
echo "GIT_COMMIT: $GIT_COMMIT"
7034
echo "GIT_TAG: $GIT_TAG"
7135
echo "VERSION: $VERSION"
7236
echo "TAG: $TAG"
7337
echo "ARCH: $ARCH"
74-
<<<<<<< HEAD
75-
<<<<<<< HEAD
76-
<<<<<<< HEAD
77-
<<<<<<< HEAD
78-
<<<<<<< HEAD
79-
=======
80-
>>>>>>> 3b008b0e1 ((cherry-pick) go generate and validate changes)
81-
=======
82-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
83-
=======
84-
=======
85-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
86-
<<<<<<< HEAD
87-
=======
88-
>>>>>>> a98f9bc1e ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
89-
=======
90-
>>>>>>> 7c3a753d9 ((cherry-pick) add Rancher's workflow files and add FOSSA)
91-
<<<<<<< HEAD
92-
<<<<<<< HEAD
93-
=======
94-
=======
95-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
96-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
97-
=======
98-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
99-
=======
100-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
101-
>>>>>>> 1e940af19 ((cherry-pick) add Rancher's workflow files and add FOSSA)
102-
=======
103-
>>>>>>> 0b62bbe4d ((cherry-pick) add Rancher's workflow files and add FOSSA)
104-
=======
105-
=======
106-
=======
107-
>>>>>>> 22cd243f8 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
108-
>>>>>>> fa181aa48 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
109-
<<<<<<< HEAD
110-
>>>>>>> 979f2b269 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
111-
<<<<<<< HEAD
112-
>>>>>>> e5268d711 ((cherry-pick) commits: f3277463565ce64284d96aa659b5d0d11c17f058, b8966a64f5244c7a90cbd2282157db2838a508af)
113-
=======
114-
=======
115-
=======
116-
>>>>>>> 00a097d85 ((cherry-pick) go generate and validate changes)
117-
>>>>>>> fc5b2a779 ((cherry-pick) go generate and validate changes)
118-
>>>>>>> 3b008b0e1 ((cherry-pick) go generate and validate changes)

0 commit comments

Comments
 (0)