Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 0eb3b72

Browse files
madalazartogashidm
madalazar
authored and
togashidm
committed
Migrating TAS to 0.3.0, bumping dependencies: K8s to v1.24.2, go to v1.18
This commit will also: - Bump TAS version to 0.3.0 - Bump K8s & go TAS dependencies to 1.24.2, respectively 1.18 - Bump E2E tests dependencies to K8s v1.24i.2, go 1.v18 - Migrating klog to v2.70 - Update Docker/Dockerfile to use go1.18 - - Add make image in the workflow - - Update golang alpine to 1.18 - - Disable VCS stamping - - - go: missing Git command. See https://golang.org/s/gogetcmd error obtaining VCS status: exec: "git": executable file not found in $PATH Use -buildvcs=false to disable VCS stamping. - - Update go-licenses to 1.2.0 - - Update TAS deployment file - - - From k8s 1.24 onwards node role labeled as 'master' is no longer used. However, 'node-role.kubernetes.io/master' may appear and it is kept in the tolerations to allow TAS be deployed in the control-plane node.
1 parent 2b65538 commit 0eb3b72

File tree

8 files changed

+135
-179
lines changed

8 files changed

+135
-179
lines changed

‎.github/e2e/go.mod‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,52 @@
11
module github.com/intel/platform-aware-scheduling/e2e
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling v0.2.0
6+
github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling v0.3.0
77
github.com/pkg/errors v0.9.1
8-
k8s.io/api v0.23.3
9-
k8s.io/apimachinery v0.23.3
10-
k8s.io/client-go v0.23.3
11-
k8s.io/klog/v2 v2.40.1
8+
k8s.io/api v0.24.2
9+
k8s.io/apimachinery v0.24.2
10+
k8s.io/client-go v0.24.2
11+
k8s.io/klog/v2 v2.70.0
1212
)
1313

1414
require (
15+
github.com/PuerkitoBio/purell v1.1.1 // indirect
16+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
1517
github.com/davecgh/go-spew v1.1.1 // indirect
18+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
1619
github.com/go-logr/logr v1.2.2 // indirect
20+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
21+
github.com/go-openapi/jsonreference v0.19.5 // indirect
22+
github.com/go-openapi/swag v0.19.14 // indirect
1723
github.com/gogo/protobuf v1.3.2 // indirect
1824
github.com/golang/protobuf v1.5.2 // indirect
25+
github.com/google/gnostic v0.5.7-v3refs // indirect
1926
github.com/google/go-cmp v0.5.7 // indirect
2027
github.com/google/gofuzz v1.2.0 // indirect
21-
github.com/googleapis/gnostic v0.5.5 // indirect
2228
github.com/imdario/mergo v0.3.12 // indirect
29+
github.com/josharian/intern v1.0.0 // indirect
2330
github.com/json-iterator/go v1.1.12 // indirect
31+
github.com/mailru/easyjson v0.7.6 // indirect
2432
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2533
github.com/modern-go/reflect2 v1.0.2 // indirect
34+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2635
github.com/spf13/pflag v1.0.5 // indirect
2736
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
2837
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
2938
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
3039
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
3140
golang.org/x/text v0.3.7 // indirect
32-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
41+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
3342
google.golang.org/appengine v1.6.7 // indirect
3443
google.golang.org/protobuf v1.27.1 // indirect
3544
gopkg.in/inf.v0 v0.9.1 // indirect
3645
gopkg.in/yaml.v2 v2.4.0 // indirect
3746
gopkg.in/yaml.v3 v3.0.1 // indirect
38-
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
39-
k8s.io/metrics v0.23.3 // indirect
40-
k8s.io/utils v0.0.0-20220127004650-9b3446523e65 // indirect
47+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
48+
k8s.io/metrics v0.24.2 // indirect
49+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
4150
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
4251
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
4352
sigs.k8s.io/yaml v1.3.0 // indirect

‎.github/e2e/go.sum‎

Lines changed: 41 additions & 36 deletions
Large diffs are not rendered by default.

‎extender/go.sum‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,9 @@ k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
623623
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
624624
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
625625
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
626-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU=
627626
k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU=
628627
k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
628+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU=
629629
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk=
630630
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
631631
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=

‎telemetry-aware-scheduling/deploy/images/Dockerfile‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,12 @@
1-
#
2-
# Copyright (c) 2022 Intel Corporation
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
FROM golang:1.17-alpine as user_builder
17-
RUN adduser -D -u 10001 tas
1+
# SPDX-License-Identifier: Apache-2.0
182

19-
FROM golang:1.17-alpine as builder
20-
ARG DIR=telemetry-aware-scheduling
21-
ARG SRC_ROOT=/src_root
22-
COPY . ${SRC_ROOT}
23-
24-
RUN mkdir -p /install_root/etc
25-
COPY --from=user_builder /etc/passwd /install_root/etc/passwd
26-
27-
WORKDIR ${SRC_ROOT}/${DIR}
28-
RUN CGO_ENABLED=0 GO111MODULE=on go build -ldflags="-s -w" -o /install_root/extender ./cmd \
29-
&& install -D ${SRC_ROOT}/${DIR}/LICENSE /install_root/usr/local/share/package-licenses/telemetry-aware-scheduling/LICENSE \
30-
&& scripts/copy-modules-licenses.sh ./cmd /install_root/usr/local/share/
3+
FROM golang:1.18-alpine as builder
4+
COPY . /src_root
5+
WORKDIR /src_root/telemetry-aware-scheduling
6+
ENV GOFLAGS -buildvcs=false
7+
RUN mkdir -p /install_root/etc && adduser -D -u 10001 tas && tail -1 /etc/passwd > /install_root/etc/passwd \
8+
&& CGO_ENABLED=0 GO111MODULE=on go build -ldflags="-s -w" -o /install_root/extender ./cmd \
9+
&& GO111MODULE=on go run github.com/google/[email protected] save "./cmd" --save_path /install_root/licenses
3110

3211
FROM scratch
3312
WORKDIR /

‎telemetry-aware-scheduling/deploy/tas-deployment.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ spec:
5151
tolerations:
5252
- key: node-role.kubernetes.io/master
5353
operator: Exists
54+
- key: node-role.kubernetes.io/control-plane
55+
operator: Exists
5456
affinity:
5557
nodeAffinity:
5658
requiredDuringSchedulingIgnoredDuringExecution:
5759
nodeSelectorTerms:
5860
- matchExpressions:
59-
- key: node-role.kubernetes.io/master
61+
- key: node-role.kubernetes.io/control-plane
6062
operator: Exists
6163

‎telemetry-aware-scheduling/go.mod‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/intel/platform-aware-scheduling/extender v0.2.0
7-
k8s.io/api v0.23.3
8-
k8s.io/apimachinery v0.23.3
9-
k8s.io/client-go v0.23.3
10-
k8s.io/klog/v2 v2.40.1
11-
k8s.io/metrics v0.23.3
6+
github.com/intel/platform-aware-scheduling/extender v0.3.0
7+
k8s.io/api v0.24.2
8+
k8s.io/apimachinery v0.24.2
9+
k8s.io/client-go v0.24.2
10+
k8s.io/klog/v2 v2.70.0
11+
k8s.io/metrics v0.24.2
1212
)
1313

1414
require (
@@ -19,35 +19,44 @@ require (
1919
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
2020
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2121
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
22+
github.com/PuerkitoBio/purell v1.1.1 // indirect
23+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2224
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
2326
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2427
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
2528
github.com/go-logr/logr v1.2.2 // indirect
29+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30+
github.com/go-openapi/jsonreference v0.19.5 // indirect
31+
github.com/go-openapi/swag v0.19.14 // indirect
2632
github.com/gogo/protobuf v1.3.2 // indirect
2733
github.com/golang/protobuf v1.5.2 // indirect
34+
github.com/google/gnostic v0.5.7-v3refs // indirect
2835
github.com/google/go-cmp v0.5.7 // indirect
2936
github.com/google/gofuzz v1.2.0 // indirect
30-
github.com/googleapis/gnostic v0.5.5 // indirect
3137
github.com/imdario/mergo v0.3.12 // indirect
38+
github.com/josharian/intern v1.0.0 // indirect
3239
github.com/json-iterator/go v1.1.12 // indirect
40+
github.com/mailru/easyjson v0.7.6 // indirect
3341
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3442
github.com/modern-go/reflect2 v1.0.2 // indirect
43+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3544
github.com/pkg/errors v0.9.1 // indirect
3645
github.com/spf13/pflag v1.0.5 // indirect
37-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
46+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
3847
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
3948
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
4049
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
4150
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
4251
golang.org/x/text v0.3.7 // indirect
43-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
52+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
4453
google.golang.org/appengine v1.6.7 // indirect
4554
google.golang.org/protobuf v1.27.1 // indirect
4655
gopkg.in/inf.v0 v0.9.1 // indirect
4756
gopkg.in/yaml.v2 v2.4.0 // indirect
4857
gopkg.in/yaml.v3 v3.0.1 // indirect
49-
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
50-
k8s.io/utils v0.0.0-20220127004650-9b3446523e65 // indirect
58+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
59+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
5160
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
5261
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
5362
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)