Merge branch 'main' into lint-repo

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,40 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    # At 23:30 on Sunday
+    - cron: '30 23 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    - run: |
+       make linux
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.lighthouse/jenkins-x/pullrequest.yaml

@@ -13,17 +13,13 @@ spec:
         stepTemplate:
           image: uses:jenkins-x/jx3-pipeline-catalog/tasks/go-plugin/pullrequest.yaml@versionStream
           name: ""
-          resources:
-            requests:
-              cpu: 400m
-              memory: 600Mi
+          resources: {}
           workingDir: /workspace/source
         steps:
         - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
           name: ""
           resources: {}
         - name: jx-variables
-          resources: {}
         - name: build-make-linux
           resources: {}
         - name: build-make-test

.lighthouse/jenkins-x/release.yaml

@@ -22,7 +22,6 @@ spec:
         - name: next-version
           resources: {}
         - name: jx-variables
-          resources: {}
         - name: release-binary
           resources: {}
         - name: build-and-push-image:webhooks
@@ -76,16 +75,19 @@ spec:
             /kaniko/executor $KANIKO_FLAGS --context=/workspace/source --dockerfile=docker/gc/Dockerfile --destination=ghcr.io/jenkins-x/lighthouse-gc-jobs:$VERSION --destination=ghcr.io/jenkins-x/lighthouse-gc-jobs:latest --build-arg=VERSION=$VERSION
         - name: chart-docs
           resources: {}
-        - image: ghcr.io/jenkins-x/jx-changelog:0.0.43
+        - image: ghcr.io/jenkins-x/jx-boot:3.10.73
           name: changelog
           resources: {}
           script: |
             #!/usr/bin/env sh
             source .jx/variables.sh
 
-            sed -i -e "s/^version:.*/version: $VERSION/" ./charts/$REPO_NAME/Chart.yaml
-            sed -i -e "s/tag:.*/tag: $VERSION/" ./charts/$REPO_NAME/values.yaml;
-
+            if [ -d "charts/$REPO_NAME" ]; then
+              jx gitops yset -p version -v "$VERSION" -f ./charts/$REPO_NAME/Chart.yaml
+              jx gitops yset -p appVersion -v "$VERSION" -f ./charts/$REPO_NAME/Chart.yaml
+              jx gitops yset -p 'image.tag' -v "$VERSION" -f ./charts/$REPO_NAME/values.yaml;
+            else echo no charts; fi
+            
             jx changelog create --verbose --header-file=hack/changelog-header.md --version=$VERSION --rev=$PULL_BASE_SHA --output-markdown=changelog.md --prerelease
         - name: release-chart
           resources: {}

Makefile

@@ -36,31 +36,31 @@ build: build-webhooks build-poller build-keeper build-foghorn build-tekton-contr
 
 .PHONY: build-webhooks
 build-webhooks: ## Build the webhooks controller binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(WEBHOOKS_EXECUTABLE) $(WEBHOOKS_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(WEBHOOKS_EXECUTABLE) $(WEBHOOKS_MAIN_SRC_FILE)
 
 .PHONY: build-poller
 build-poller: ## Build the poller controller binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(POLLER_EXECUTABLE) $(POLLER_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(POLLER_EXECUTABLE) $(POLLER_MAIN_SRC_FILE)
 
 .PHONY: build-keeper
 build-keeper: ## Build the keeper controller binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(KEEPER_EXECUTABLE) $(KEEPER_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(KEEPER_EXECUTABLE) $(KEEPER_MAIN_SRC_FILE)
 
 .PHONY: build-foghorn
 build-foghorn: ## Build the foghorn controller binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(FOGHORN_EXECUTABLE) $(FOGHORN_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(FOGHORN_EXECUTABLE) $(FOGHORN_MAIN_SRC_FILE)
 
 .PHONY: build-gc-jobs
 build-gc-jobs: ## Build the GC jobs binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(GC_JOBS_EXECUTABLE) $(GC_JOBS_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(GC_JOBS_EXECUTABLE) $(GC_JOBS_MAIN_SRC_FILE)
 
 .PHONY: build-tekton-controller
 build-tekton-controller: ## Build the Tekton controller binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(TEKTON_CONTROLLER_EXECUTABLE) $(TEKTON_CONTROLLER_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(TEKTON_CONTROLLER_EXECUTABLE) $(TEKTON_CONTROLLER_MAIN_SRC_FILE)
 
 .PHONY: build-jenkins-controller
 build-jenkins-controller: ## Build the Jenkins controller binary for the native OS
-	$(GO) build -i -ldflags "$(GO_LDFLAGS)" -o bin/$(JENKINS_CONTROLLER_EXECUTABLE) $(JENKINS_CONTROLLER_MAIN_SRC_FILE)
+	$(GO) build -ldflags "$(GO_LDFLAGS)" -o bin/$(JENKINS_CONTROLLER_EXECUTABLE) $(JENKINS_CONTROLLER_MAIN_SRC_FILE)
 
 .PHONY: release
 release: linux
@@ -180,7 +180,7 @@ verify-code-unchanged:
 
 CONTROLLER_GEN := $(GOPATH)/bin/controller-gen
 $(CONTROLLER_GEN):
-	pushd /tmp; $(GO) get -u sigs.k8s.io/controller-tools/cmd/[email protected]; popd
+	$(GO) install sigs.k8s.io/controller-tools/cmd/[email protected]
 
 crd-manifests: $(CONTROLLER_GEN)
 	$(CONTROLLER_GEN) crd:maxDescLen=0 paths="./pkg/apis/lighthouse/v1alpha1/..." output:crd:artifacts:config=crds
@@ -190,9 +190,7 @@ docs: job-docs plugins-docs config-docs trigger-docs crds-docs ## Builds generat
 
 DOCS_GEN := bin/gen-docs
 $(DOCS_GEN):
-	$(GO) build -o bin/gen-docs ./hack/struct-docs.go
-
-	pushd /tmp; $(GO) get -u sigs.k8s.io/controller-tools/cmd/[email protected]; popd
+	cd hack && $(GO) build -o ../$(DOCS_GEN) struct-docs.go
 
 .PHONY: crds-docs
 crds-docs: $(DOCS_GEN)

OWNERS

@@ -1,34 +1,4 @@
 approvers:
-- abayer
-- cagiti
-- ccojocar
-- daveconde
-- dgozalo
-- eddycharly
-- garethjevans
-- hferentschik
-- jstrachan
-- macox
-- mrageh
-- pmuir
-- rawlingsj
-- warrenbailey
-- wbrefvem
-- ankitm123
+- maintainers
 reviewers:
-- abayer
-- cagiti
-- ccojocar
-- daveconde
-- dgozalo
-- eddycharly
-- garethjevans
-- hferentschik
-- jstrachan
-- macox
-- mrageh
-- pmuir
-- rawlingsj
-- warrenbailey
-- wbrefvem
-- ankitm123
+- maintainers

OWNERS_ALIASES

@@ -0,0 +1,3 @@
+foreignAliases:
+- name: jx-community
+  org: jenkins-x