Merge branch 'main' into customlabels

goharbor · Jul 28, 2023 · 0a2e804 · 0a2e804
2 parents 3c66442 + 8c7a4a6
commit 0a2e804
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -3,7 +3,7 @@ name: Dev Image
 on:
   push:
     branches:
-    - master
+    - main
     - release-*
 
 jobs:

diff --git a/.github/workflows/chart-tests.yml b/.github/workflows/chart-tests.yml
@@ -6,7 +6,7 @@ on:
     - '**'
   pull_request:
     branches:
-    - master
+    - main
     - release-*
     - feature/*
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, 0.5.0, 0.5.1, 0.5.2, release-* ]
+    branches: [ main, 0.5.0, 0.5.1, 0.5.2, release-* ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '34 9 * * 3'
 

diff --git a/.github/workflows/contour-tests.yml b/.github/workflows/contour-tests.yml
@@ -6,7 +6,7 @@ on:
     - '**'
   pull_request:
     branches:
-    - master
+    - main
     - release-*
     - feature/*
 

diff --git a/.github/workflows/harbor-e2e-tests.yml b/.github/workflows/harbor-e2e-tests.yml
@@ -6,7 +6,7 @@ on:
     - '**'
   pull_request:
     branches:
-    - master
+    - main
     - release-*
     - feature/*
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ on:
     - '**'
   pull_request:
     branches:
-    - master
+    - main
     - release-*
     - feature/*
 

diff --git a/Makefile b/Makefile
@@ -661,7 +661,7 @@ $(GORELEASER):
 
 # find or download stringer
 # download stringer if necessary
-STRINGER_VERSION := v0.1.12
+STRINGER_VERSION := v0.11.0
 STRINGER := $(BIN)/stringer
 
 .PHONY: stringer

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/bb3adb454b424e66ae3b9bdf2ab2fce1)](https://www.codacy.com/gh/goharbor/harbor-operator/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=goharbor/harbor-operator&amp;utm_campaign=Badge_Grade)
 [![Go Reference](https://pkg.go.dev/badge/github.com/goharbor/harbor-operator.svg)](https://pkg.go.dev/github.com/goharbor/harbor-operator)
 
-> **ATTENTIONS:** THE `MASTER` BRANCH MAY BE IN AN UNSTABLE OR EVEN BROKEN STATE DURING DEVELOPMENT.
+> **ATTENTIONS:** THE `main` BRANCH MAY BE IN AN UNSTABLE OR EVEN BROKEN STATE DURING DEVELOPMENT.
 
 [Harbor](https://github.com/goharbor/harbor/) is a CNCF hosted open source trusted cloud-native registry project that stores, signs, and scans content. Harbor is composed on numerous stateful and stateless components and dependencies that may be deployed, updated, healed, backuped or scaled respecting some constraints.
 
@@ -126,7 +126,7 @@ Harbor operator exposes the frontend service with ingress (CRD version: `v1beta1
 
 ## Contributions
 
-Harbor operator project is developed and maintained by the [Harbor operator workgroup](https://github.com/goharbor/community/blob/master/workgroups/wg-operator/README.md). If you're willing to join the group and do contributions to operator project, welcome to [contact us](#community). Follow the [Development guide](https://github.com/goharbor/harbor-operator/blob/master/docs/development.md) to start on the project.
+Harbor operator project is developed and maintained by the [Harbor operator workgroup](https://github.com/goharbor/community/blob/main/workgroups/wg-operator/README.md). If you're willing to join the group and do contributions to operator project, welcome to [contact us](#community). Follow the [Development guide](https://github.com/goharbor/harbor-operator/blob/main/docs/development.md) to start on the project.
 
 Special thanks to the [contributors](./MAINTAINERS) who did significant contributions ([see feature area](./docs/feature-areas.md)).
 
@@ -136,7 +136,7 @@ Special thanks to the [contributors](./MAINTAINERS) who did significant contribu
 * **User Group:** Join Harbor user email group: [[email protected]](https://lists.cncf.io/g/harbor-users) to get update of Harbor's news, features, releases, or to provide suggestion and feedback.  
 * **Developer Group:** Join Harbor developer group: [[email protected]](https://lists.cncf.io/g/harbor-dev) for discussion on Harbor development and contribution.
 * **Slack:** Join Harbor's community for discussion and ask questions: [Cloud Native Computing Foundation](https://slack.cncf.io/), channel: [#harbor-operator-dev](https://cloud-native.slack.com/messages/harbor-operator-dev/)
-* **Community meeting:** attend [bi-weekly community meeting](https://github.com/goharbor/community/blob/master/MEETING_SCHEDULE.md) for Q&A
+* **Community meeting:** attend [bi-weekly community meeting](https://github.com/goharbor/community/blob/main/MEETING_SCHEDULE.md) for Q&A
 
 ## Additional references
 
@@ -150,7 +150,7 @@ Special thanks to the [contributors](./MAINTAINERS) who did significant contribu
 
 ## Related links
 
-* Contribute: <https://github.com/goharbor/harbor-operator/blob/master/CONTRIBUTING>
+* Contribute: <https://github.com/goharbor/harbor-operator/blob/main/CONTRIBUTING>
 * Report bugs: <https://github.com/goharbor/harbor-operator/issues>
 * Get latest version: <https://hub.docker.com/r/goharbor/harbor-operator>
 
@@ -162,4 +162,4 @@ OVHcloud uses the operator at scale to operate part of its private registry serv
 
 ## License
 
-See [LICENSE](https://github.com/goharbor/harbor-operator/blob/master/LICENSE) for licensing details.
+See [LICENSE](https://github.com/goharbor/harbor-operator/blob/main/LICENSE) for licensing details.
diff --git a/apis/goharbor.io/v1alpha3/core_types.go b/apis/goharbor.io/v1alpha3/core_types.go
@@ -38,7 +38,7 @@ type CoreList struct {
 type CoreSpec struct {
 	harbormetav1.ComponentSpec `json:",inline"`
 
-	// https://github.com/goharbor/harbor/blob/master/src/lib/config/metadata/metadatalist.go#L62
+	// https://github.com/goharbor/harbor/blob/main/src/lib/config/metadata/metadatalist.go#L62
 	CoreConfig `json:",inline"`
 
 	CertificateInjection `json:",inline"`

diff --git a/apis/goharbor.io/v1beta1/core_types.go b/apis/goharbor.io/v1beta1/core_types.go
@@ -39,7 +39,7 @@ type CoreList struct {
 type CoreSpec struct {
 	harbormetav1.ComponentSpec `json:",inline"`
 
-	// https://github.com/goharbor/harbor/blob/master/src/lib/config/metadata/metadatalist.go#L62
+	// https://github.com/goharbor/harbor/blob/main/src/lib/config/metadata/metadatalist.go#L62
 	CoreConfig `json:",inline"`
 
 	CertificateInjection `json:",inline"`

diff --git a/charts/harbor-operator/README.md b/charts/harbor-operator/README.md
@@ -40,7 +40,7 @@ Deploy Harbor Operator
 | image.pullPolicy | string | `"IfNotPresent"` | The image pull policy for the controller. |
 | image.registry | string | `"docker.io"` | The image registry whose default is docker.io. |
 | image.repository | string | `"goharbor/harbor-operator"` | The image repository whose default is the chart appVersion. |
-| image.tag | string | `"dev_master"` | The image tag whose default is the chart appVersion. |
+| image.tag | string | `"dev"` | The image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Reference to one or more secrets to be used when pulling images <https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/> For example: `[   {"name":"image-pull-secret"} ]` |
 | installCRDs | bool | `false` | If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED |
 | leaderElection.namespace | string | `"kube-system"` | The namespace used to store the ConfigMap for leader election |

diff --git a/charts/harbor-operator/templates/NOTES.txt b/charts/harbor-operator/templates/NOTES.txt
@@ -3,4 +3,4 @@
   export NS={{ .Release.Namespace }}
   kubectl get po $POD_NAME -n $NS
 
-2. Apply CRD to create harbor instance, referring to the document: https://github.com/goharbor/harbor-operator/blob/master/docs/CRD/custom-resource-definition.md
+2. Apply CRD to create harbor instance, referring to the document: https://github.com/goharbor/harbor-operator/blob/main/docs/CRD/custom-resource-definition.md
diff --git a/charts/harbor-operator/values.yaml b/charts/harbor-operator/values.yaml
@@ -6,7 +6,7 @@ image:
   # image.pullPolicy -- The image pull policy for the controller.
   pullPolicy: IfNotPresent
   # image.tag -- The image tag whose default is the chart appVersion.
-  tag: "dev_master"
+  tag: "dev"
 
 # installCRDs -- If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED
 installCRDs: false

diff --git a/config/config/assets/jobservice-config.yaml.tmpl b/config/config/assets/jobservice-config.yaml.tmpl
@@ -1,6 +1,6 @@
 {{/*
-  https://github.com/goharbor/harbor/blob/master/make/photon/prepare/templates/jobservice/config.yml.jinja
-  https://github.com/goharbor/harbor/blob/master/src/jobservice/config/config.go#L63
+  https://github.com/goharbor/harbor/blob/main/make/photon/prepare/templates/jobservice/config.yml.jinja
+  https://github.com/goharbor/harbor/blob/main/src/jobservice/config/config.go#L63
 */}}
 {{- if .Spec.TLS.Enabled }}
 protocol: "https"

diff --git a/controllers/goharbor/core/deployments.go b/controllers/goharbor/core/deployments.go
@@ -486,7 +486,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, core *goharborv1.Core) (
 						Name:  controllers.Core.String(),
 						Image: image,
 						Ports: containerPorts,
-						// https://github.com/goharbor/harbor/blob/master/make/photon/prepare/templates/core/env.jinja
+						// https://github.com/goharbor/harbor/blob/main/make/photon/prepare/templates/core/env.jinja
 						Env: envs,
 						LivenessProbe: &corev1.Probe{
 							ProbeHandler: corev1.ProbeHandler{

diff --git a/controllers/goharbor/harbor/registry.go b/controllers/goharbor/harbor/registry.go
@@ -122,7 +122,7 @@ func (r *Reconciler) AddRegistryInternalCertificate(ctx context.Context, harbor
 }
 
 const (
-	// https://github.com/goharbor/harbor/blob/master/make/photon/prepare/utils/configs.py#L14
+	// https://github.com/goharbor/harbor/blob/main/make/photon/prepare/utils/configs.py#L14
 	RegistryAuthenticationUsername = "harbor_registry_user"
 
 	RegistryAuthenticationPasswordLength      = 32

diff --git a/controllers/goharbor/jobservice/deployments.go b/controllers/goharbor/jobservice/deployments.go
@@ -329,7 +329,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, jobservice *goharborv1.J
 						Image: image,
 						Ports: containerPorts,
 
-						// https://github.com/goharbor/harbor/blob/master/make/photon/prepare/templates/jobservice/env.jinja
+						// https://github.com/goharbor/harbor/blob/main/make/photon/prepare/templates/jobservice/env.jinja
 						Env: envs,
 						LivenessProbe: &corev1.Probe{
 							ProbeHandler: corev1.ProbeHandler{

diff --git a/docs/development.md b/docs/development.md
@@ -9,7 +9,7 @@ cd harbor-operator
 
 You developped a new cool feature? Fixed an annoying bug? We would be happy to hear from you!
 
-Have a look in [CONTRIBUTING.md](https://github.com/goharbor/harbor-operator/blob/master/CONTRIBUTING.md)
+Have a look in [CONTRIBUTING.md](https://github.com/goharbor/harbor-operator/blob/main/CONTRIBUTING.md)
 
 ## Dependencies
 

diff --git a/docs/installation/by-helm-chart.md b/docs/installation/by-helm-chart.md
@@ -116,7 +116,7 @@ you can check the additional references listed below.
 
 Besides, you can also enable the operators of the dependent services in `charts/harbor-operator/values.yaml` to deploy full stack Harbor more efficient.
 
-* Find the configuration items of the dependent operators charts from [here](https://github.com/goharbor/harbor-operator/blob/master/charts/harbor-operator/values.yaml#L252)
+* Find the configuration items of the dependent operators charts from [here](https://github.com/goharbor/harbor-operator/blob/main/charts/harbor-operator/values.yaml#L252)
 
 ## What's next
 

diff --git a/docs/installation/kustomization-all-in-one.md b/docs/installation/kustomization-all-in-one.md
@@ -18,7 +18,7 @@ The installation guide documented here help you deploy Harbor operator stack wit
 Directly apply the all-in-one deployment manifest to your Kubernetes cluster:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/goharbor/harbor-operator/master/manifests/cluster/deployment.yaml
+kubectl apply -f https://raw.githubusercontent.com/goharbor/harbor-operator/main/manifests/cluster/deployment.yaml
 ```
 
 >NOTES: Here we use the deployment manifest in the `main` branch as an example, for deploying the released versions, you can get the deployment manifest in the GitHub release page or find it in the corresponding code branch such as `release-1.3.0`.
@@ -81,7 +81,7 @@ kubectl apply -f customized_deployment.yaml
 Delete the harbor operator stack by the deployment manifest:
 
 ```shell
-kubectl delete -f https://raw.githubusercontent.com/goharbor/harbor-operator/master/manifests/cluster/deployment.yaml
+kubectl delete -f https://raw.githubusercontent.com/goharbor/harbor-operator/main/manifests/cluster/deployment.yaml
 ```
 
 Or delete the harbor operator stack by the kustomization template:

diff --git a/docs/installation/kustomization-custom.md b/docs/installation/kustomization-custom.md
@@ -103,7 +103,7 @@ kustomize build | kubectl delete -f -
 Deploy the Harbor operator with the deployment manifest:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/goharbor/harbor-operator/master/manifests/harbor/deployment.yaml
+kubectl apply -f https://raw.githubusercontent.com/goharbor/harbor-operator/main/manifests/harbor/deployment.yaml
 ```
 
 Check the Harbor operator status (by default it's deployed into the `harbor-operator-ns` namespace):
@@ -122,7 +122,7 @@ harbor-operator-76c44d8ddd-z7rgx   1/1     Running   0          80s
 For deleting the Harbor operator, call
 
 ```shell
-kubectl delete -f https://raw.githubusercontent.com/goharbor/harbor-operator/master/manifests/harbor/deployment.yaml
+kubectl delete -f https://raw.githubusercontent.com/goharbor/harbor-operator/main/manifests/harbor/deployment.yaml
 ```
 
 Of course, you can clone the codebase into your computer and then customize and deploy with the kustomization template:

diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -279,7 +279,7 @@ status:
     operator:
       controllerGitCommit: 35056b427665e9ee6331e7b3ddede8c26b86dbc5
       controllerName: harborcluster
-      controllerVersion: dev_master
+      controllerVersion: dev
     revision: 1642500151584677122
     status: healthy
 ```

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -66511,8 +66511,8 @@ data:
     httpport = 8080
   jobservice-config.yaml.tmpl: |
     {{/*
-      https://github.com/goharbor/harbor/blob/master/make/photon/prepare/templates/jobservice/config.yml.jinja
-      https://github.com/goharbor/harbor/blob/master/src/jobservice/config/config.go#L63
+      https://github.com/goharbor/harbor/blob/main/make/photon/prepare/templates/jobservice/config.yml.jinja
+      https://github.com/goharbor/harbor/blob/main/src/jobservice/config/config.go#L63
     */}}
     {{- if .Spec.TLS.Enabled }}
     protocol: "https"
@@ -67108,7 +67108,7 @@ spec:
               fieldPath: metadata.namespace
         - name: CONFIGURATION_FROM
           value: env,file:/etc/harbor-operator/config.yaml
-        image: ghcr.io/goharbor/harbor-operator:dev_master
+        image: ghcr.io/goharbor/harbor-operator:dev
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/manifests/cluster/kustomization.yaml b/manifests/cluster/kustomization.yaml
@@ -47,4 +47,4 @@ images:
     newName: ghcr.io/goharbor/postgres-operator
   - name: goharbor/harbor-operator
     newName: ghcr.io/goharbor/harbor-operator
-    newTag: dev_master
+    newTag: dev
diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -44731,8 +44731,8 @@ data:
     httpport = 8080
   jobservice-config.yaml.tmpl: |
     {{/*
-      https://github.com/goharbor/harbor/blob/master/make/photon/prepare/templates/jobservice/config.yml.jinja
-      https://github.com/goharbor/harbor/blob/master/src/jobservice/config/config.go#L63
+      https://github.com/goharbor/harbor/blob/main/make/photon/prepare/templates/jobservice/config.yml.jinja
+      https://github.com/goharbor/harbor/blob/main/src/jobservice/config/config.go#L63
     */}}
     {{- if .Spec.TLS.Enabled }}
     protocol: "https"
@@ -45207,7 +45207,7 @@ spec:
               fieldPath: metadata.namespace
         - name: CONFIGURATION_FROM
           value: env,file:/etc/harbor-operator/config.yaml
-        image: ghcr.io/goharbor/harbor-operator:dev_master
+        image: ghcr.io/goharbor/harbor-operator:dev
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/manifests/harbor/kustomization.yaml b/manifests/harbor/kustomization.yaml
@@ -23,4 +23,4 @@ resources:
 images:
   - name: goharbor/harbor-operator
     newName: ghcr.io/goharbor/harbor-operator
-    newTag: dev_master
+    newTag: dev