Use new application-api and support new model in webhook.

New model has git url in Spec.Source.GitURL field, also
Spec.ContainerImage isn't relevant when checking git source.

Also allows updates of not important fields : Spec.ComponentName, Spec.Application

Updates controller-gen version, since old version isn't able to parse
new model spec.

Fixes Dockerfile, because podman build didn't work because originally
used directory didn't exist.

Fixes CI, bumps go version to 1.24.

Signed-off-by: Robert Cerven <rcerven@redhat.com>

Author: rcerven

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout application-service source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4

.github/workflows/pr.yml

@@ -12,14 +12,14 @@ jobs:
       OPERATOR_SDK_VERSION: v1.14.0
       PR_CHECK: true
     steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.21
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: './go.mod'
       - name: Cache Operator SDK ${{ env.OPERATOR_SDK_VERSION }}
         uses: actions/cache@v3
         id: cache-operator-sdk
@@ -87,12 +87,6 @@ jobs:
           fi
       - name: Run Go Tests
         run: |
-          # Temporarily adding a pact-go installation. 
-          # It should be gone once https://issues.redhat.com/browse/HAC-4879 is solved
-          go get github.com/pact-foundation/pact-go/v2@2.x.x
-          go install github.com/pact-foundation/pact-go/v2@2.x.x
-          sudo /home/runner/go/bin/pact-go -l DEBUG install 
-
           make test
       - name: Check if Manager Kustomize has the right image
         run: |
@@ -102,7 +96,7 @@ jobs:
         uses: codecov/codecov-action@v2.1.0
       - name: Run Gosec Security Scanner
         run: |
-          go install github.com/securego/gosec/v2/cmd/gosec@v2.19.0
+          go install github.com/securego/gosec/v2/cmd/gosec@v2.24.7
           make gosec
           if [[ $? != 0 ]]
           then
@@ -123,15 +117,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Check if dockerimage build is working
         run: docker build -f ./Dockerfile .
   kube-linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Create ./.kube-linter/ for deployment files
         shell: bash
         run: mkdir -p ./.kube-linter/ && touch .kube-linter/manifests.yaml

Dockerfile

@@ -1,7 +1,7 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi9/go-toolset:1.20.10 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1762230058 AS builder
 
-WORKDIR /workspace
+WORKDIR /opt/app-root/src
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -32,7 +32,7 @@ ENV ENABLE_WEBHOOK_HTTP2=${ENABLE_WEBHOOK_HTTP2}
 
 # Set the Git config for the AppData bot
 WORKDIR /
-COPY --from=builder /workspace/manager .
+COPY --from=builder /opt/app-root/src/manager .
 
 COPY appdata.gitconfig /.gitconfig
 RUN chgrp -R 0 /.gitconfig && chmod -R g=u /.gitconfig

Makefile

@@ -50,7 +50,7 @@ ENABLE_WEBHOOK_HTTP2 ?=false
 APPLICATION_API_CRD = https://raw.githubusercontent.com/konflux-ci/application-api/main/manifests/application-api-customresourcedefinitions.yaml
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.22
+ENVTEST_K8S_VERSION = 1.28
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -137,7 +137,7 @@ vet: ## Run go vet against code.
 .PHONY: gosec
 gosec:
 	# Run this command to install gosec, if not installed:
-	# go install github.com/securego/gosec/v2/cmd/gosec@v2.19.0
+	# go install github.com/securego/gosec/v2/cmd/gosec@v2.24.7
 	gosec -no-fail -fmt=sarif -out=gosec.sarif  ./...
 
 lint:
@@ -194,15 +194,15 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3)
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.1.0)
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.
-	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@395cfc7486e652d19fe1b544a436f9852ba26e4f)
+	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.19)
 
 DLV = $(shell pwd)/bin/dlv
 dlv:

config/webhook/manifests.yaml

@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
@@ -50,7 +49,6 @@ webhooks:
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:

go.mod

@@ -1,10 +1,10 @@
 module github.com/redhat-appstudio/application-service
 
-go 1.21
+go 1.24
 
 require (
 	github.com/go-logr/logr v1.4.1
-	github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409
+	github.com/konflux-ci/application-api v0.0.0-20260311124621-11066ce65102
 	github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.27.10

go.sum

@@ -116,8 +116,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409 h1:hAhhcfc/EXW9eKS827PmyYuhk+Y4KkVOsT53Uo9OzCU=
-github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
+github.com/konflux-ci/application-api v0.0.0-20260311124621-11066ce65102 h1:KJL7pB++31mmXdY56YKW04DJchPzpPDOPFwg/RlhohM=
+github.com/konflux-ci/application-api v0.0.0-20260311124621-11066ce65102/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
 github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d h1:z7j3mglNoXvIrw5Vz/Ul+izoITRaqYURPIWrFoEyHgI=
 github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d/go.mod h1:AcChx7FjpYSIkDvQgaUKyauuF0PXm3ivB5MqZSC9Eis=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

webhooks/component_webhook.go

@@ -67,7 +67,7 @@ func (r *ComponentWebhook) Default(ctx context.Context, obj runtime.Object) erro
 		// Get the Application CR
 		// Use the background context to ensure the operator's kubeconfig is used
 		hasApplication := appstudiov1alpha1.Application{}
-		err := r.client.Get(context.Background(), types.NamespacedName{Name: component.Spec.Application, Namespace: component.Namespace}, &hasApplication)
+		err := r.client.Get(ctx, types.NamespacedName{Name: component.Spec.Application, Namespace: component.Namespace}, &hasApplication)
 		if err != nil {
 			// Don't block if the Application doesn't exist yet - this will retrigger whenever the resource is modified
 			err = fmt.Errorf("unable to get the Application %s for Component %s, ignoring for now", component.Spec.Application, compName)
@@ -78,7 +78,7 @@ func (r *ComponentWebhook) Default(ctx context.Context, obj runtime.Object) erro
 				var curComp appstudiov1alpha1.Component
 				// Get the Component to update using the operator's kubeconfig so that there aren't any permissions issues setting the owner reference
 				// Use the background context to ensure the operator's kubeconfig is used
-				err := r.client.Get(context.Background(), types.NamespacedName{Name: compName, Namespace: component.Namespace}, &curComp)
+				err := r.client.Get(ctx, types.NamespacedName{Name: compName, Namespace: component.Namespace}, &curComp)
 				if err != nil {
 					componentlog.Error(err, "unable to get current component, so skip setting owner reference")
 					return nil
@@ -175,10 +175,13 @@ func (r *ComponentWebhook) ValidateCreate(ctx context.Context, obj runtime.Objec
 
 	if comp.Spec.Source.GitSource != nil && comp.Spec.Source.GitSource.URL != "" {
 		if _, err := url.ParseRequestURI(comp.Spec.Source.GitSource.URL); err != nil {
-			return fmt.Errorf(err.Error() + appstudiov1alpha1.InvalidSchemeGitSourceURL)
+			return fmt.Errorf("%s%s", err.Error(), appstudiov1alpha1.InvalidSchemeGitSourceURL)
 		}
 		sourceSpecified = true
-	} else if comp.Spec.ContainerImage != "" {
+	} else if comp.Spec.Source.GitURL != "" {
+		if _, err := url.ParseRequestURI(comp.Spec.Source.GitURL); err != nil {
+			return fmt.Errorf("%s%s", err.Error(), appstudiov1alpha1.InvalidSchemeGitSourceURL)
+		}
 		sourceSpecified = true
 	}
 
@@ -208,14 +211,6 @@ func (r *ComponentWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj ru
 	componentlog := r.log.WithValues("controllerKind", "Component").WithValues("name", newComp.Name).WithValues("namespace", newComp.Namespace)
 	componentlog.Info("validating the update request")
 
-	if newComp.Spec.ComponentName != oldComp.Spec.ComponentName {
-		return fmt.Errorf(appstudiov1alpha1.ComponentNameUpdateError, newComp.Spec.ComponentName)
-	}
-
-	if newComp.Spec.Application != oldComp.Spec.Application {
-		return fmt.Errorf(appstudiov1alpha1.ApplicationNameUpdateError, newComp.Spec.Application)
-	}
-
 	if newComp.Spec.Source.GitSource != nil && oldComp.Spec.Source.GitSource != nil && (newComp.Spec.Source.GitSource.URL != oldComp.Spec.Source.GitSource.URL) {
 		return fmt.Errorf(appstudiov1alpha1.GitSourceUpdateError, *(newComp.Spec.Source.GitSource))
 	}

webhooks/component_webhook_test.go

@@ -72,8 +72,8 @@ var _ = Describe("Application validation webhook", func() {
 
 			err := k8sClient.Create(ctx, hasComp)
 			Expect(err).Should(HaveOccurred())
-			Expect(err.Error()).Should(ContainSubstring("spec.componentName in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'"))
-			Expect(err.Error()).Should(ContainSubstring("spec.application in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'"))
+			Expect(err.Error()).Should(ContainSubstring("spec.componentName in body should match '^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'"))
+			Expect(err.Error()).Should(ContainSubstring("spec.application in body should match '^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'"))
 
 			hasComp.Spec.ComponentName = ComponentName
 			hasComp.Spec.Application = HASAppName
@@ -149,26 +149,13 @@ var _ = Describe("Application validation webhook", func() {
 				return !reflect.DeepEqual(createdHasComp, &appstudiov1alpha1.Component{})
 			}, timeout, interval).Should(BeTrue())
 
-			// Update the Comp application
-			createdHasComp.Spec.Application = "newapp"
-			err := k8sClient.Update(ctx, createdHasComp)
-			Expect(err).Should(HaveOccurred())
-			Expect(err.Error()).Should(ContainSubstring(fmt.Errorf(appstudiov1alpha1.ApplicationNameUpdateError, createdHasComp.Spec.Application).Error()))
-
-			// Update the Comp component name
-			createdHasComp.Spec.Application = hasComp.Spec.Application
-			createdHasComp.Spec.ComponentName = "newcomp"
-			err = k8sClient.Update(ctx, createdHasComp)
-			Expect(err).Should(HaveOccurred())
-			Expect(err.Error()).Should(ContainSubstring(fmt.Errorf(appstudiov1alpha1.ComponentNameUpdateError, createdHasComp.Spec.ComponentName).Error()))
-
 			// Update the Comp git src
 			createdHasComp.Spec.ComponentName = hasComp.Spec.ComponentName
 			createdHasComp.Spec.Source.GitSource.Context = hasComp.Spec.Source.GitSource.Context
 			createdHasComp.Spec.Source.GitSource = &appstudiov1alpha1.GitSource{
 				URL: "newlink",
 			}
-			err = k8sClient.Update(ctx, createdHasComp)
+			err := k8sClient.Update(ctx, createdHasComp)
 			Expect(err).Should(HaveOccurred())
 			Expect(err.Error()).Should(ContainSubstring(fmt.Errorf(appstudiov1alpha1.GitSourceUpdateError, *createdHasComp.Spec.Source.GitSource).Error()))
 

webhooks/component_webhook_unit_test.go

@@ -187,6 +187,25 @@ func TestComponentCreateValidatingWebhook(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:   "component needs to have one source specified, new GitURL field",
+			client: fakeClient,
+			err:    appstudiov1alpha1.MissingGitOrImageSource,
+			newComp: appstudiov1alpha1.Component{
+				ObjectMeta: v1.ObjectMeta{
+					Name: "test-component",
+				},
+				Spec: appstudiov1alpha1.ComponentSpec{
+					ComponentName: "component1",
+					Application:   "application1",
+					Source: appstudiov1alpha1.ComponentSource{
+						ComponentSourceUnion: appstudiov1alpha1.ComponentSourceUnion{
+							GitURL: "",
+						},
+					},
+				},
+			},
+		},
 		{
 			name:   "valid component with invalid git scheme src",
 			client: fakeClient,
@@ -209,8 +228,9 @@ func TestComponentCreateValidatingWebhook(t *testing.T) {
 			},
 		},
 		{
-			name:   "valid component with container image",
+			name:   "invalid component without git source",
 			client: fakeClient,
+			err:    appstudiov1alpha1.MissingGitOrImageSource,
 			newComp: appstudiov1alpha1.Component{
 				ObjectMeta: v1.ObjectMeta{
 					Name: "test-component",
@@ -222,6 +242,44 @@ func TestComponentCreateValidatingWebhook(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:   "valid component with git source",
+			client: fakeClient,
+			newComp: appstudiov1alpha1.Component{
+				ObjectMeta: v1.ObjectMeta{
+					Name: "test-component",
+				},
+				Spec: appstudiov1alpha1.ComponentSpec{
+					ComponentName: "component1",
+					Application:   "application1",
+					Source: appstudiov1alpha1.ComponentSource{
+						ComponentSourceUnion: appstudiov1alpha1.ComponentSourceUnion{
+							GitSource: &appstudiov1alpha1.GitSource{
+								URL: "http://link",
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name:   "valid component with git source, new GitURL field",
+			client: fakeClient,
+			newComp: appstudiov1alpha1.Component{
+				ObjectMeta: v1.ObjectMeta{
+					Name: "test-component",
+				},
+				Spec: appstudiov1alpha1.ComponentSpec{
+					ComponentName: "component1",
+					Application:   "application1",
+					Source: appstudiov1alpha1.ComponentSource{
+						ComponentSourceUnion: appstudiov1alpha1.ComponentSourceUnion{
+							GitURL: "http://link",
+						},
+					},
+				},
+			},
+		},
 		{
 			name:   "validate succeeds but updating nudged component fails",
 			client: fakeErrorClient,
@@ -238,6 +296,13 @@ func TestComponentCreateValidatingWebhook(t *testing.T) {
 					BuildNudgesRef: []string{
 						"alternating-error-comp",
 					},
+					Source: appstudiov1alpha1.ComponentSource{
+						ComponentSourceUnion: appstudiov1alpha1.ComponentSourceUnion{
+							GitSource: &appstudiov1alpha1.GitSource{
+								URL: "http://link",
+							},
+						},
+					},
 				},
 			},
 		},
@@ -290,27 +355,6 @@ func TestComponentUpdateValidatingWebhook(t *testing.T) {
 		updateComp appstudiov1alpha1.Component
 		err        string
 	}{
-		{
-			name:   "component name cannot be changed",
-			client: fakeClient,
-			err:    fmt.Errorf(appstudiov1alpha1.ComponentNameUpdateError, "component1").Error(),
-			updateComp: appstudiov1alpha1.Component{
-				Spec: appstudiov1alpha1.ComponentSpec{
-					ComponentName: "component1",
-				},
-			},
-		},
-		{
-			name:   "application name cannot be changed",
-			client: fakeClient,
-			err:    fmt.Errorf(appstudiov1alpha1.ApplicationNameUpdateError, "application1").Error(),
-			updateComp: appstudiov1alpha1.Component{
-				Spec: appstudiov1alpha1.ComponentSpec{
-					ComponentName: "component",
-					Application:   "application1",
-				},
-			},
-		},
 		{
 			name:   "git src url cannot be changed",
 			client: fakeClient,