Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from nginxinc to nginx #132

Merged
merged 2 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
with:
images: |
ghcr.io/nginxinc/kic-test-${{ matrix.type }}-server
ghcr.io/nginx/kic-test-${{ matrix.type }}-server
tags: |
type=edge
type=ref,event=pr
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
continue-on-error: true
id: scan
with:
image: ghcr.io/nginxinc/kic-test-${{ matrix.type }}-server:${{ steps.meta.outputs.version }}
image: ghcr.io/nginx/kic-test-${{ matrix.type }}-server:${{ steps.meta.outputs.version }}
only-fixed: true
add-cpes-if-none: true

Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
with:
images: |
ghcr.io/nginxinc/kic-test-grpc-server
ghcr.io/nginx/kic-test-grpc-server
tags: |
type=edge
type=ref,event=pr
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
continue-on-error: true
id: scan
with:
image: ghcr.io/nginxinc/kic-test-grpc-server:${{ steps.meta.outputs.version }}
image: ghcr.io/nginx/kic-test-grpc-server:${{ steps.meta.outputs.version }}
only-fixed: true
add-cpes-if-none: true

Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
with:
images: |
ghcr.io/nginxinc/kic-test-dos-server
ghcr.io/nginx/kic-test-dos-server
tags: |
type=edge
type=ref,event=pr
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
continue-on-error: true
id: scan
with:
image: ghcr.io/nginxinc/kic-test-dos-server:${{ steps.meta.outputs.version }}
image: ghcr.io/nginx/kic-test-dos-server:${{ steps.meta.outputs.version }}
only-fixed: true
add-cpes-if-none: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
sparse-checkout: |
labeler.yml
sparse-checkout-cone-mode: false
repository: nginxinc/k8s-common
repository: nginx/k8s-common

- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @nginxinc/kic
* @nginx/kic
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# KIC Test Containers

This repository contains the Dockerfiles and code for the test containers used in the [Kubernetes Ingress Controller](https://github.com/nginxinc/kubernetes-ingress).
This repository contains the Dockerfiles and code for the test containers used in the [Kubernetes Ingress Controller](https://github.com/nginx/kubernetes-ingress).

## Building the containers for local testing

Expand All @@ -19,5 +19,5 @@ make grpc-server

## Publishing the containers

The containers are published to the [NGINX GitHub Container Registry](https://github.com/orgs/nginxinc/packages?repo_name=kic-test-containers)
The containers are published to the [NGINX GitHub Container Registry](https://github.com/orgs/nginx/packages?repo_name=kic-test-containers)
when a new tag is created in this repository. You can see the packages on the right side of this page.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/nginxinc/kic-test-containers
module github.com/nginx/kic-test-containers

go 1.23.0
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>nginxinc/k8s-common",
"github>nginx/k8s-common",
"schedule:monthly"
]
}
2 changes: 1 addition & 1 deletion tcp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.12
FROM golang:1.23-alpine AS builder

WORKDIR /go/src/github.com/nginxinc/kic-test-containers/
WORKDIR /go/src/github.com/nginx/kic-test-containers/
COPY tcp/main.go ./tcp/
COPY go.mod utils.go ./
RUN CGO_ENABLED=0 GOOS=linux go build -o /main ./tcp/
Expand Down
2 changes: 1 addition & 1 deletion tcp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ overridden.
- Test the change:
- Use the minikube registry ```$ eval $(minikube docker-env)```
- Build the docker image from the root of the project ```docker build -t tcp-server .```
- Update the [service yaml](https://github.com/nginxinc/kubernetes-ingress/blob/main/tests/data/transport-server-tcp-load-balance/standard/service_deployment.yaml)
- Update the [service yaml](https://github.com/nginx/kubernetes-ingress/blob/main/tests/data/transport-server-tcp-load-balance/standard/service_deployment.yaml)
to use the local version ```-> imagePullPolicy: Never```
- Test the changes
- Publish the tcp-server change
Expand Down
2 changes: 1 addition & 1 deletion tcp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"net"

utils "github.com/nginxinc/kic-test-containers"
utils "github.com/nginx/kic-test-containers"
)

var version string
Expand Down
2 changes: 1 addition & 1 deletion udp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.12
FROM golang:1.23-alpine AS builder

WORKDIR /go/src/github.com/nginxinc/kic-test-containers/
WORKDIR /go/src/github.com/nginx/kic-test-containers/
COPY udp/main.go ./udp/
COPY go.mod utils.go ./
RUN CGO_ENABLED=0 GOOS=linux go build -o /main ./udp/
Expand Down
2 changes: 1 addition & 1 deletion udp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ overridden.
- Test the change:
- Use the minikube registry ```$ eval $(minikube docker-env)```
- Build the docker image from the root of the project ```docker build -t udp-server .```
- Update the [service yaml](https://github.com/nginxinc/kubernetes-ingress/blob/main/tests/data/transport-server-udp-load-balance/standard/service_deployment.yaml)
- Update the [service yaml](https://github.com/nginx/kubernetes-ingress/blob/main/tests/data/transport-server-udp-load-balance/standard/service_deployment.yaml)
to use the local version ```-> imagePullPolicy: Never```
- Test the changes
- Publish the upd-server change
Expand Down
2 changes: 1 addition & 1 deletion udp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net"
"os"

utils "github.com/nginxinc/kic-test-containers"
utils "github.com/nginx/kic-test-containers"
)

var version string
Expand Down
Loading