merge master

openshift · Jul 18, 2024 · 9966c2b · 9966c2b
2 parents f5357b4 + d4e710f
commit 9966c2b
Show file tree

Hide file tree

Showing 31 changed files with 411 additions and 472 deletions.
diff --git a/.tekton/assisted-service-saas-main-pull-request.yaml b/.tekton/assisted-service-saas-main-pull-request.yaml
@@ -30,6 +30,10 @@ spec:
     value: Dockerfile.assisted-service
   - name: path-context
     value: .
+  - name: build-args
+    value:
+    - release={{target_branch}
+    - version={{revision}}
   pipelineSpec:
     finally:
     - name: show-sbom

diff --git a/.tekton/assisted-service-saas-main-push.yaml b/.tekton/assisted-service-saas-main-push.yaml
@@ -27,6 +27,10 @@ spec:
     value: Dockerfile.assisted-service
   - name: path-context
     value: .
+  - name: build-args
+    value:
+    - release={{target_branch}
+    - version={{revision}}
   pipelineSpec:
     finally:
     - name: show-sbom

diff --git a/Dockerfile.assisted-service b/Dockerfile.assisted-service
@@ -29,9 +29,35 @@ RUN cd ./cmd/operator && CGO_ENABLED=1 GOFLAGS="" GO111MODULE=on go build -o /bu
 RUN cd ./cmd/webadmission && CGO_ENABLED=1 GOFLAGS="" GO111MODULE=on go build -o /build/assisted-service-admission
 RUN cd ./cmd/agentbasedinstaller/client && CGO_ENABLED=1 GOFLAGS="" GO111MODULE=on go build -o /build/agent-installer-client
 
+# Licenses
+FROM registry.access.redhat.com/ubi9/go-toolset:1.18 AS licenses
+
+ADD . /app
+WORKDIR /app
+
+RUN go install github.com/google/[email protected]
+RUN ${HOME}/go/bin/go-licenses save --save_path /tmp/licenses ./...
+
 # Create final image
 FROM quay.io/centos/centos:$BASE_TAG
 
+ARG release=main
+ARG version=latest
+
+LABEL com.redhat.component assisted-service
+LABEL description "Service that installs Openshift"
+LABEL summary "Service that installs Openshift"
+LABEL io.k8s.description "Service that installs Openshift"
+LABEL distribution-scope public
+LABEL name assisted-service
+LABEL release ${release}
+LABEL version ${version}
+LABEL url https://github.com/openshift/assisted-service
+LABEL vendor "Red Hat, Inc."
+LABEL maintainer "Red Hat"
+
+COPY --from=licenses /tmp/licenses /licenses
+
 COPY hack/container_build_scripts/replace_dnf_repositories_ref_if_needed.sh .
 COPY hack/container_build_scripts/utils.sh .
 ARG BASE_TAG
@@ -59,4 +85,7 @@ COPY --from=builder /build/agent-installer-client /usr/local/bin/agent-installer
 RUN ln -s /usr/local/bin/agent-installer-client /agent-based-installer-register-cluster-and-infraenv
 ENV GODEBUG=madvdontneed=1
 ENV GOGC=50
+
+USER 1001:1001
+
 CMD ["/assisted-service"]
diff --git a/cmd/main.go b/cmd/main.go
@@ -304,8 +304,6 @@ func main() {
 		mirrorRegistriesBuilder,
 		system.NewLocalSystemInfo(),
 	)
-	extracterHandler := oc.NewExtracter(&executer.CommonExecuter{},
-		oc.Config{MaxTries: oc.DefaultTries, RetryDelay: oc.DefaltRetryDelay})
 
 	versionHandler, versionsAPIHandler, err := createVersionHandlers(
 		log,
@@ -330,7 +328,7 @@ func main() {
 	createS3Bucket(objectHandler, log)
 
 	manifestsApi := manifests.NewManifestsAPI(db, log.WithField("pkg", "manifests"), objectHandler, usageManager)
-	operatorsManager := operators.NewManager(log, manifestsApi, Options.OperatorsConfig, objectHandler, extracterHandler)
+	operatorsManager := operators.NewManager(log, manifestsApi, Options.OperatorsConfig, objectHandler)
 	hwValidator := hardware.NewValidator(log.WithField("pkg", "validators"), Options.HWValidatorConfig, operatorsManager, providerRegistry)
 	connectivityValidator := connectivity.NewValidator(log.WithField("pkg", "validators"))
 	Options.InstructionConfig.HostFSMountDir = hostFSMountDir

diff --git a/data/default_release_images.json b/data/default_release_images.json
@@ -92,17 +92,17 @@
         "cpu_architectures": [
             "x86_64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.13.44-x86_64",
-        "version": "4.13.44"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.13.45-x86_64",
+        "version": "4.13.45"
     },
     {
         "openshift_version": "4.13",
         "cpu_architecture": "arm64",
         "cpu_architectures": [
             "arm64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.13.44-aarch64",
-        "version": "4.13.44"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.13.45-aarch64",
+        "version": "4.13.45"
     },
     {
         "openshift_version": "4.13-multi",
@@ -113,26 +113,26 @@
             "ppc64le",
             "s390x"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.13.44-multi",
-        "version": "4.13.44-multi"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.13.45-multi",
+        "version": "4.13.45-multi"
     },
     {
         "openshift_version": "4.14",
         "cpu_architecture": "x86_64",
         "cpu_architectures": [
             "x86_64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.14.32-x86_64",
-        "version": "4.14.32"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.14.33-x86_64",
+        "version": "4.14.33"
     },
     {
         "openshift_version": "4.14",
         "cpu_architecture": "arm64",
         "cpu_architectures": [
             "arm64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.14.32-aarch64",
-        "version": "4.14.32"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.14.33-aarch64",
+        "version": "4.14.33"
     },
     {
         "openshift_version": "4.14-multi",
@@ -143,8 +143,8 @@
             "ppc64le",
             "s390x"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.14.32-multi",
-        "version": "4.14.32-multi"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.14.33-multi",
+        "version": "4.14.33-multi"
     },
     {
         "openshift_version": "4.15",
@@ -182,8 +182,8 @@
         "cpu_architectures": [
             "x86_64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.16.2-x86_64",
-        "version": "4.16.2",
+        "url": "quay.io/openshift-release-dev/ocp-release:4.16.3-x86_64",
+        "version": "4.16.3",
         "default": true
     },
     {
@@ -192,8 +192,8 @@
         "cpu_architectures": [
             "arm64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.16.2-aarch64",
-        "version": "4.16.2"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.16.3-aarch64",
+        "version": "4.16.3"
     },
     {
         "openshift_version": "4.16-multi",
@@ -204,8 +204,8 @@
             "ppc64le",
             "s390x"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.16.2-multi",
-        "version": "4.16.2-multi"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.16.3-multi",
+        "version": "4.16.3-multi"
     },
     {
         "openshift_version": "4.17",

diff --git a/deploy/podman/configmap.yml b/deploy/podman/configmap.yml
@@ -27,7 +27,7 @@ data:
   POSTGRESQL_PASSWORD: admin
   POSTGRESQL_USER: admin
   PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org'
-  RELEASE_IMAGES: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.67-x86_64","version":"4.10.67"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.67-aarch64","version":"4.10.67"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.59-x86_64","version":"4.11.59"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.59-aarch64","version":"4.11.59"},{"openshift_version":"4.11.0-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-x86_64","version":"4.12.60"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-aarch64","version":"4.12.60"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-multi","version":"4.12.60-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.44-x86_64","version":"4.13.44"},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.44-aarch64","version":"4.13.44"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.44-multi","version":"4.13.44-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.32-x86_64","version":"4.14.32"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.32-aarch64","version":"4.14.32"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.32-multi","version":"4.14.32-multi"},{"openshift_version":"4.15","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-x86_64","version":"4.15.21"},{"openshift_version":"4.15","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-aarch64","version":"4.15.21"},{"openshift_version":"4.15-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-multi","version":"4.15.21-multi"},{"openshift_version":"4.16","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.2-x86_64","version":"4.16.2","default":true},{"openshift_version":"4.16","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.2-aarch64","version":"4.16.2"},{"openshift_version":"4.16-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.2-multi","version":"4.16.2-multi"},{"openshift_version":"4.17","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-x86_64","support_level":"beta","version":"4.17.0-ec.1"},{"openshift_version":"4.17","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-aarch64","support_level":"beta","version":"4.17.0-ec.1"},{"openshift_version":"4.17-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-multi","support_level":"beta","version":"4.17.0-ec.1-multi"}]'
+  RELEASE_IMAGES: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.67-x86_64","version":"4.10.67"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.67-aarch64","version":"4.10.67"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.59-x86_64","version":"4.11.59"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.59-aarch64","version":"4.11.59"},{"openshift_version":"4.11.0-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-x86_64","version":"4.12.60"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-aarch64","version":"4.12.60"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-multi","version":"4.12.60-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.45-x86_64","version":"4.13.45"},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.45-aarch64","version":"4.13.45"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.45-multi","version":"4.13.45-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.33-x86_64","version":"4.14.33"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.33-aarch64","version":"4.14.33"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.33-multi","version":"4.14.33-multi"},{"openshift_version":"4.15","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-x86_64","version":"4.15.21"},{"openshift_version":"4.15","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-aarch64","version":"4.15.21"},{"openshift_version":"4.15-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-multi","version":"4.15.21-multi"},{"openshift_version":"4.16","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.3-x86_64","version":"4.16.3","default":true},{"openshift_version":"4.16","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.3-aarch64","version":"4.16.3"},{"openshift_version":"4.16-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.3-multi","version":"4.16.3-multi"},{"openshift_version":"4.17","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-x86_64","support_level":"beta","version":"4.17.0-ec.1"},{"openshift_version":"4.17","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-aarch64","support_level":"beta","version":"4.17.0-ec.1"},{"openshift_version":"4.17-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-multi","support_level":"beta","version":"4.17.0-ec.1-multi"}]'
   SERVICE_BASE_URL: http://127.0.0.1:8090
   STORAGE: filesystem
   ENABLE_UPGRADE_AGENT: "true"