Skip to content

Commit c5cb5b3

Browse files
committed
docs: fix example with something more relivenet
fix how we are doing licensing headers too
1 parent c9573c6 commit c5cb5b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+220
-424
lines changed

.github/workflows/operator-ci.yaml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,13 @@ on:
4949
env:
5050
REGISTRY: ghcr.io
5151
IMAGE_NAME: ${{ github.repository }}
52-
GO_VERSION: 1.23.6
52+
GO_VERSION: 1.23.7
5353
PLATFORMS: linux/amd64,linux/arm64
5454

5555
# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
5656
jobs:
57-
unit-test:
58-
runs-on: ubuntu-latest
59-
steps:
60-
- uses: actions/checkout@v4
61-
- name: Setup Go 1.23
62-
uses: actions/setup-go@v5
63-
with:
64-
go-version: 1.23
65-
- name: Unit tests
66-
run: |
67-
cd operator
68-
make unit-tests
6957
k8s-tests:
7058
runs-on: ubuntu-latest
71-
needs: [unit-test] # Don't run the k8s tests if the unit tests fail
7259
steps:
7360
- uses: actions/checkout@v4
7461
with:
@@ -94,7 +81,7 @@ jobs:
9481
run: |
9582
cd operator
9683
GITHUB_TOKEN=${{ secrets.github_token }} make create-kind-cluster
97-
make e2e-tests
84+
make test
9885
build-and-push-operator:
9986
runs-on: ubuntu-latest
10087
needs: [k8s-tests] # Don't run the build and push if the k8s tests fail

.gitlab-ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
default:
2222
tags:
2323
- baseos-infra
24-
image: gitlab-master.nvidia.com:5005/dgx/infra/skyhook-operator/ci:latest
24+
image: gitlab-master.nvidia.com:5005/dgx/infra/skyhook-operator/ci:latest ## TODO: this is no longer getting updated, we need to address this
2525

2626
variables:
2727
KUBERNETES_CPU_LIMIT: "4"
@@ -35,10 +35,6 @@ workflow:
3535
rules:
3636
- if: $CI_COMMIT_TAG
3737

38-
include:
39-
- project: dgx/infra/gitlint-ci
40-
ref: main
41-
file: gitlint.yml
4238

4339
## setup vault creds
4440
bootstrap:

chart/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LICENSE
1+
../LICENSE

containers/agent.Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
#
2+
# LICENSE START
3+
#
4+
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
# LICENSE END
19+
#
120
FROM python:3.12-alpine AS builder
221

322
ARG AGENT_VERSION

containers/agentless/Dockerfile

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
1+
#
2+
# LICENSE START
23
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
4+
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
65
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
89
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
# LICENSE END
19+
#
20+
1421

1522
ARG BUSYBOX_TAG=1.36.1
1623

containers/agentless/entrypoint.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
#
2222

2323

24-
25-
26-
27-
28-
29-
30-
31-
32-
33-
34-
35-
3624
SLEEP_LEN=${SLEEP_LEN:-$(($RANDOM % 5 + 5))}
3725

3826
echo "agentless ["$@"] sleep for ${SLEEP_LEN} and exit with ${EXIT_CODE}"

containers/agentless/versions.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
#
2222

2323

24-
25-
26-
27-
28-
29-
30-
31-
32-
33-
34-
35-
3624
## This is the list of versions that will be tagged for the test container so it can be
3725
## used in the e2e tests.
3826
##

containers/ci.Dockerfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
1+
#
2+
# LICENSE START
23
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
4+
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
65
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
89
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
# LICENSE END
19+
#
1420

1521
ARG GO_VERSION
1622

containers/operator.Dockerfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
1+
#
2+
# LICENSE START
23
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
4+
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
65
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
89
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
# LICENSE END
19+
#
1420

1521
# Build the manager binary
1622
ARG GO_VERSION

operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ merge-coverage:
223223
echo "mode: set" > $(REPORTING)/cover.out
224224
## skip first line with +2
225225
tail -n +2 $(REPORTING)/temp-cover.out | sed '/mode: set/d' >> $(REPORTING)/cover.out
226-
$(sedrp) 's/^\/.*(\/skyhook-operator.*)/gitlab-master\.nvidia\.com\/dgx\/infra\1/g' $(REPORTING)/cover.out
226+
$(sedrp) 's/^\/.*(\/skyhook\/operator.*)/github\.com\/NVIDIA\1/g' $(REPORTING)/cover.out ## TODO: need to test more
227227

228228
.PHONY: lint
229229
lint: golangci-lint license-check ## Run golangci-lint linter & yamllint

0 commit comments

Comments
 (0)