Skip to content

Commit

Permalink
init repo rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Abdiramen committed Jun 25, 2024
1 parent e9da30f commit dc10a2e
Show file tree
Hide file tree
Showing 91 changed files with 402 additions and 396 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/controller_bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
Thanks for taking the time to fill out this bug report!
Note, you do not need to create an issue if you have a change ready to submit.
You can open a [pull request](https://github.com/ngrok/kubernetes-ingress-controller/pulls) immediately instead.
You can open a [pull request](https://github.com/ngrok/kubernetes-operator/pulls) immediately instead.
- type: input
attributes:
label: Kubernetes Version
Expand Down Expand Up @@ -42,7 +42,7 @@ body:
description: We want to see relevant kubernetes logs showing error messages
or helpful debugging information
placeholder: >
Run `kubectl logs -l app.kubernetes.io/name=kubernetes-ingress-controller` and copy the output here.
Run `kubectl logs -l app.kubernetes.io/name=kubernetes-operator` and copy the output here.
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/helm_bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
Thanks for taking the time to fill out this bug report!
Note, you do not need to create an issue if you have a change ready to submit.
You can open a [pull request](https://github.com/ngrok/kubernetes-ingress-controller/pulls) immediately instead.
You can open a [pull request](https://github.com/ngrok/kubernetes-operator/pulls) immediately instead.
- type: input
attributes:
label: Kubernetes Version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
context: .
platforms: ${{ steps.buildx-setup.outputs.platforms }}
push: false
tags: ngrok/kubernetes-ingress-controller:latest
tags: ngrok/kubernetes-operator:latest

go-mod-tidy:
name: Go Mod Tidy Check
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
permissions:
contents: read
pull-requests: read
if: github.repository == 'ngrok/kubernetes-ingress-controller'
if: github.repository == 'ngrok/kubernetes-operator'
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand All @@ -39,7 +39,7 @@ jobs:
needs:
- changes
if: |
github.repository == 'ngrok/kubernetes-ingress-controller' &&
github.repository == 'ngrok/kubernetes-operator' &&
github.event_name == 'push' &&
github.ref == 'refs/heads/main'
steps:
Expand Down Expand Up @@ -67,15 +67,15 @@ jobs:
context: .
platforms: ${{ steps.buildx-setup.outputs.platforms }}
push: true
tags: ngrok/kubernetes-ingress-controller:latest
tags: ngrok/kubernetes-operator:latest
- name: Build and push tag'd docker image
uses: docker/build-push-action@v3
if: ${{ needs.changes.outputs.tag == 'true' }}
with:
context: .
platforms: ${{ steps.buildx-setup.outputs.platforms }}
push: true
tags: ngrok/kubernetes-ingress-controller:${{ steps.extract_tag.outputs.tag }}
tags: ngrok/kubernetes-operator:${{ steps.extract_tag.outputs.tag }}
- name: Create GitHub Release
uses: actions/github-script@v6
if: ${{ needs.changes.outputs.tag == 'true' }}
Expand All @@ -86,8 +86,8 @@ jobs:
const release = await github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: `kubernetes-ingress-controller-${tag}`,
name: `kubernetes-ingress-controller-${tag}`,
tag_name: `kubernetes-operator-${tag}`,
name: `kubernetes-operator-${tag}`,
body: `${tag}`,
draft: false,
prerelease: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
permissions:
contents: read
pull-requests: read
if: github.repository == 'ngrok/kubernetes-ingress-controller'
if: github.repository == 'ngrok/kubernetes-operator'
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand All @@ -37,7 +37,7 @@ jobs:
contents: write # need to write releases
needs: [changes]
if: |
(github.repository == 'ngrok/kubernetes-ingress-controller') &&
(github.repository == 'ngrok/kubernetes-operator') &&
(needs.changes.outputs.charts == 'true')
steps:
- name: Checkout repo
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.13.0
**Full Changelog**: TBD

### Changed
- Renamed docker image from `ngrok/kubernetes-ingress-controller` to `ngrok/kubernetes-operator`.

## 0.12.0
**Full Changelog**: https://github.com/ngrok/kubernetes-ingress-controller/compare/kubernetes-ingress-controller-0.11.0...kubernetes-ingress-controller-0.12.0

Expand Down
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

# Image URL to use all building/pushing image targets
IMG ?= kubernetes-ingress-controller
IMG ?= kubernetes-operator
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.29.0

REPO_URL = github.com/ngrok/kubernetes-ingress-controller
REPO_URL = github.com/ngrok/kubernetes-operator

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -57,7 +57,7 @@ preflight: ## Verifies required things like the go version

.PHONY: manifests
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
$(CONTROLLER_GEN) rbac:roleName=ngrok-ingress-controller-manager-role crd webhook paths="{./api/ingress/v1alpha1/, ./api/ngrok/v1alpha1, ./internal/controller/ingress/, ./internal/controller/ngrok/, ./internal/controller/gateway/}" \
$(CONTROLLER_GEN) rbac:roleName=ngrok-operator-role crd webhook paths="{./api/ingress/v1alpha1/, ./api/ngrok/v1alpha1, ./internal/controller/ingress/, ./internal/controller/ngrok/, ./internal/controller/gateway/}" \
output:crd:artifacts:config=$(HELM_TEMPLATES_DIR)/crds \
output:rbac:artifacts:config=$(HELM_TEMPLATES_DIR)/rbac

Expand Down Expand Up @@ -116,8 +116,8 @@ endif

.PHONY: deploy
deploy: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## Deploy controller to the K8s cluster specified in ~/.kube/config.
helm upgrade ngrok-ingress-controller $(HELM_CHART_DIR) --install \
--namespace ngrok-ingress-controller \
helm upgrade ngrok-operator $(HELM_CHART_DIR) --install \
--namespace ngrok-operator \
--create-namespace \
--set image.repository=$(IMG) \
--set image.tag="latest" \
Expand All @@ -128,12 +128,12 @@ deploy: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## D
--set log.level=debug \
--set log.stacktraceLevel=panic \
--set metaData.env=local,metaData.from=makefile &&\
kubectl rollout restart deployment ngrok-ingress-controller-kubernetes-ingress-controller-manager -n ngrok-ingress-controller
kubectl rollout restart deployment ngrok-ingress-controller-kubernetes-operator -n ngrok-operator

.PHONY: deploy_gateway
deploy_gateway: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## Deploy controller to the K8s cluster specified in ~/.kube/config.
helm upgrade ngrok-ingress-controller $(HELM_CHART_DIR) --install \
--namespace ngrok-ingress-controller \
helm upgrade ngrok-operator $(HELM_CHART_DIR) --install \
--namespace ngrok-operator \
--create-namespace \
--set image.repository=$(IMG) \
--set image.tag="latest" \
Expand All @@ -145,7 +145,7 @@ deploy_gateway: _deploy-check-env-vars docker-build manifests kustomize _helm_se
--set log.stacktraceLevel=panic \
--set metaData.env=local,metaData.from=makefile \
--set useExperimentalGatewayApi=true &&\
kubectl rollout restart deployment ngrok-ingress-controller-kubernetes-ingress-controller-manager -n ngrok-ingress-controller
kubectl rollout restart deployment ngrok-ingress-controller-kubernetes-operator -n ngrok-operator

.PHONY: _deploy-check-env-vars
_deploy-check-env-vars:
Expand All @@ -158,7 +158,7 @@ endif

.PHONY: undeploy
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
helm uninstall ngrok-ingress-controller
helm uninstall ngrok-operator

##@ Build Dependencies

Expand Down
20 changes: 10 additions & 10 deletions PROJECT

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</p>

<p>
<a href="https://github.com/ngrok/kubernetes-ingress-controller/actions?query=branch%3Amain+event%3Apush">
<img src="https://github.com/ngrok/kubernetes-ingress-controller/actions/workflows/ci.yaml/badge.svg" alt="CI Status"/>
<a href="https://github.com/ngrok/kubernetes-operator/actions?query=branch%3Amain+event%3Apush">
<img src="https://github.com/ngrok/kubernetes-operator/actions/workflows/ci.yaml/badge.svg" alt="CI Status"/>
</a>
<a href="https://github.com/ngrok/kubernetes-ingress-controller/blob/master/LICENSE">
<a href="https://github.com/ngrok/kubernetes-operator/blob/master/LICENSE">
<img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License"/>
</a>
<a href="#features-and-beta-status">
Expand All @@ -34,7 +34,7 @@
Leverage [ngrok](https://ngrok.com/) for your ingress in your Kubernetes cluster. Instantly add load balancing, authentication, and observability to your services via ngrok Cloud Edge modules using Custom Resource Definitions (CRDs) and Kubernetes-native tooling. This repo contains both our [Kubernetes Ingress Controller](https://kubernetes.io/docs/concepts/services-networking/ingress/) and the [Kubernetes Gateway API](https://gateway-api.sigs.k8s.io/)


[Installation](#installation) | [Getting Started](https://ngrok.com/docs/using-ngrok-with/k8s/) | [Documentation](#documentation) | [Developer Guide](https://github.com/ngrok/kubernetes-ingress-controller/blob/main/docs/developer-guide/README.md) | [Known Issues](#known-issues)
[Installation](#installation) | [Getting Started](https://ngrok.com/docs/using-ngrok-with/k8s/) | [Documentation](#documentation) | [Developer Guide](https://github.com/ngrok/kubernetes-operator/blob/main/docs/developer-guide/README.md) | [Known Issues](#known-issues)

## Installation

Expand All @@ -45,7 +45,7 @@ Leverage [ngrok](https://ngrok.com/) for your ingress in your Kubernetes cluster
Add the ngrok Ingress Controller Helm chart:

```sh
helm repo add ngrok https://ngrok.github.io/kubernetes-ingress-controller
helm repo add ngrok https://ngrok.github.io/kubernetes-operator
```

Then, install the latest version (setting the appropriate values for your environment):
Expand All @@ -55,7 +55,7 @@ export NAMESPACE=[YOUR_K8S_NAMESPACE]
export NGROK_AUTHTOKEN=[AUTHTOKEN]
export NGROK_API_KEY=[API_KEY]

helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller \
helm install ngrok-ingress-controller ngrok/kubernetes-operator \
--namespace $NAMESPACE \
--create-namespace \
--set credentials.apiKey=$NGROK_API_KEY \
Expand All @@ -78,7 +78,7 @@ kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/downloa
Then, during the helm install set the experimental gateway flag.

```sh
helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller \
helm install ngrok-ingress-controller ngrok/kubernetes-operator \
--namespace $NAMESPACE \
--create-namespace \
--set credentials.apiKey=$NGROK_API_KEY \
Expand All @@ -91,7 +91,7 @@ Apply the [sample combined manifest](manifest-bundle.yaml) from our repo:

```sh
kubectl apply -n ngrok-ingress-controller \
-f https://raw.githubusercontent.com/ngrok/kubernetes-ingress-controller/main/manifest-bundle.yaml
-f https://raw.githubusercontent.com/ngrok/kubernetes-operator/main/manifest-bundle.yaml
```

For a more in-depth installation guide follow our step-by-step [Getting Started](https://ngrok.com/docs/using-ngrok-with/k8s/) guide.
Expand All @@ -106,7 +106,7 @@ The full documentation for the ngrok Ingress Controller can be found on our [k8s
>
> This project is currently in beta as we continue testing and receiving feedback. The functionality and CRD contracts may change. It is currently used internally at ngrok for providing ingress to some of our production workloads.
1. Current issues of concern for production workloads are being tracked [here](https://github.com/ngrok/kubernetes-ingress-controller/issues/208) and [here](https://github.com/ngrok/kubernetes-ingress-controller/issues/219).
1. Current issues of concern for production workloads are being tracked [here](https://github.com/ngrok/kubernetes-operator/issues/208) and [here](https://github.com/ngrok/kubernetes-operator/issues/219).

## Support

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.0
0.13.0
4 changes: 2 additions & 2 deletions api/ingress/v1alpha1/ngrok_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
// common ngrok API/Dashboard fields
type ngrokAPICommon struct {
// Description is a human-readable description of the object in the ngrok API/Dashboard
// +kubebuilder:default:=`Created by kubernetes-ingress-controller`
// +kubebuilder:default:=`Created by kubernetes-operator`
Description string `json:"description,omitempty"`
// Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard
// +kubebuilder:default:=`{"owned-by":"kubernetes-ingress-controller"}`
// +kubebuilder:default:=`{"owned-by":"kubernetes-operator"}`
Metadata string `json:"metadata,omitempty"`
}

Expand Down
22 changes: 11 additions & 11 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ import (

"github.com/ngrok/ngrok-api-go/v5"

ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1"
ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1"
"github.com/ngrok/kubernetes-ingress-controller/internal/annotations"
gatewaycontroller "github.com/ngrok/kubernetes-ingress-controller/internal/controller/gateway"
controllers "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ingress"
ngrokctr "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ngrok"
"github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi"
"github.com/ngrok/kubernetes-ingress-controller/internal/store"
"github.com/ngrok/kubernetes-ingress-controller/internal/version"
"github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver"
ingressv1alpha1 "github.com/ngrok/kubernetes-operator/api/ingress/v1alpha1"
ngrokv1alpha1 "github.com/ngrok/kubernetes-operator/api/ngrok/v1alpha1"
"github.com/ngrok/kubernetes-operator/internal/annotations"
gatewaycontroller "github.com/ngrok/kubernetes-operator/internal/controller/gateway"
controllers "github.com/ngrok/kubernetes-operator/internal/controller/ingress"
ngrokctr "github.com/ngrok/kubernetes-operator/internal/controller/ngrok"
"github.com/ngrok/kubernetes-operator/internal/ngrokapi"
"github.com/ngrok/kubernetes-operator/internal/store"
"github.com/ngrok/kubernetes-operator/internal/version"
"github.com/ngrok/kubernetes-operator/pkg/tunneldriver"
//+kubebuilder:scaffold:imports
)

Expand Down Expand Up @@ -120,7 +120,7 @@ func cmd() *cobra.Command {
c.Flags().StringVar(&opts.apiURL, "api-url", "", "The base URL to use for the ngrok api")
c.Flags().StringVar(&opts.controllerName, "controller-name", "k8s.ngrok.com/ingress-controller", "The name of the controller to use for matching ingresses classes")
c.Flags().StringVar(&opts.watchNamespace, "watch-namespace", "", "Namespace to watch for Kubernetes resources. Defaults to all namespaces.")
c.Flags().StringVar(&opts.managerName, "manager-name", "ngrok-ingress-controller-manager", "Manager name to identify unique ngrok ingress controller instances")
c.Flags().StringVar(&opts.managerName, "manager-name", "ngrok-ingress-controller", "Manager name to identify unique ngrok ingress controller instances")
c.Flags().BoolVar(&opts.useExperimentalGatewayAPI, "use-experimental-gateway-api", false, "sets up experemental gatewayAPI")
c.Flags().StringVar(&opts.rootCAs, "root-cas", "trusted", "trusted (default) or host: use the trusted ngrok agent CA or the host CA")
opts.zapOpts = &zap.Options{}
Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ make deploy

### Using the E2E Fixtures

Several examples are provided in the [`e2e-fixtures` folder](https://github.com/ngrok/kubernetes-ingress-controller/tree/main/e2e-fixtures). To use an example, make a copy of the included `EXAMPLE*config.yaml` in the same directory, like this:
Several examples are provided in the [`e2e-fixtures` folder](https://github.com/ngrok/kubernetes-operator/tree/main/e2e-fixtures). To use an example, make a copy of the included `EXAMPLE*config.yaml` in the same directory, like this:

- `cp e2e-fixtures/hello-world-ingress/EXAMPLE-config.yaml e2e-fixtures/hello-world-ingress/config.yaml`
- `cp e2e-fixtures/ingress-class/EXAMPLE-config-different.yaml e2e-fixtures/ingress-class/config-different.yaml`
Expand Down
Loading

0 comments on commit dc10a2e

Please sign in to comment.