Merge branch 'project-codeflare:main' into instascale-hypershift-e2e

Fiona-Waters · web-flow · commit 241f61670584 · 2024-01-24T09:02:14.000Z
diff --git a/.github/workflows/auto-add-issues.yml b/.github/workflows/auto-add-issues.yml
diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
@@ -45,7 +45,7 @@ jobs:
       - name: Set Go
         uses: actions/setup-go@v3
         with:
-          go-version: v1.19
+          go-version: v1.20
 
       - name: Set up gotestfmt
         uses: gotesttools/gotestfmt-action@v2
@@ -92,6 +92,12 @@ jobs:
           echo "Printing KubeRay operator logs"
           kubectl logs -n ray-system --tail -1 -l app.kubernetes.io/name=kuberay | tee ${CODEFLARE_TEST_OUTPUT_DIR}/kuberay.log
 
+      - name: Export all KinD pod logs
+        uses: ./common/github-actions/kind-export-logs
+        if: always() && steps.deploy.outcome == 'success'
+        with:
+          output-directory: ${CODEFLARE_TEST_OUTPUT_DIR}
+
       - name: Upload logs
         uses: actions/upload-artifact@v3
         if: always() && steps.deploy.outcome == 'success'
diff --git a/.github/workflows/olm_tests.yaml b/.github/workflows/olm_tests.yaml
@@ -44,7 +44,7 @@ jobs:
       - name: Set Go
         uses: actions/setup-go@v3
         with:
-          go-version: v1.19
+          go-version: v1.20
 
       - name: Set up gotestfmt
         uses: gotesttools/gotestfmt-action@v2
@@ -185,6 +185,12 @@ jobs:
           echo "Printing KubeRay operator logs"
           kubectl logs -n ray-system --tail -1 -l app.kubernetes.io/name=kuberay | tee ${CODEFLARE_TEST_OUTPUT_DIR}/kuberay.log
 
+      - name: Export all KinD pod logs
+        uses: ./common/github-actions/kind-export-logs
+        if: always() && steps.deploy.outcome == 'success'
+        with:
+          output-directory: ${CODEFLARE_TEST_OUTPUT_DIR}
+
       - name: Upload logs
         uses: actions/upload-artifact@v3
         if: always() && steps.deploy.outcome == 'success'
diff --git a/.github/workflows/operator-image.yml b/.github/workflows/operator-image.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Set Go
       uses: actions/setup-go@v3
       with:
-        go-version: v1.19
+        go-version: v1.20
 
     - name: Login to Quay.io
       uses: redhat-actions/podman-login@v1
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set Go
         uses: actions/setup-go@v3
         with:
-          go-version: v1.19
+          go-version: v1.20
 
       - name: Activate cache
         uses: actions/cache@v3
diff --git a/.github/workflows/tag-and-build.yml b/.github/workflows/tag-and-build.yml
@@ -64,7 +64,7 @@ jobs:
     - name: Set Go
       uses: actions/setup-go@v3
       with:
-        go-version: v1.19
+        go-version: v1.20
 
     - name: Verify that release doesn't exist yet
       shell: bash {0}
@@ -102,13 +102,22 @@ jobs:
         sed -i -E "s/(.*INSTASCALE_VERSION \?= ).*/\1${{ github.event.inputs.instascale-version }}/" Makefile
         sed -i -E "s/(.*KUBERAY_VERSION \?= ).*/\1${{ github.event.inputs.kuberay-version }}/" Makefile
 
+    - name: Update image version in params.env
+      run: |
+        VERSION=${{ github.event.inputs.version }} perl -i -pe 's/:(.*)$/:$ENV{"VERSION"}/' config/manager/params.env
+      shell: bash
+
     - name: Login to Quay.io
       uses: redhat-actions/podman-login@v1
       with:
         username: ${{ secrets.QUAY_ID }}
         password: ${{ secrets.QUAY_TOKEN }}
         registry: quay.io
 
+    - name: Align go.mod and go.sum dependencies for released components
+      run: |
+        make modules
+
     - name: Image Build and Push
       run: |
         make build
@@ -134,7 +143,7 @@ jobs:
       uses: stefanzweifel/git-auto-commit-action@v4
       with:
         commit_message: Update dependency versions for release ${{ github.event.inputs.version }}
-        file_pattern: 'README.md *.yaml Makefile go.mod go.sum'
+        file_pattern: 'README.md *.yaml Makefile go.mod go.sum *.env'
         create_branch: true
         branch: ${{ env.PR_BRANCH_NAME }}
 
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set Go
         uses: actions/setup-go@v3
         with:
-          go-version: v1.19
+          go-version: v1.20
 
       - name: Activate cache
         uses: actions/cache@v3
diff --git a/.github/workflows/verify_generated_files.yml b/.github/workflows/verify_generated_files.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Set Go
       uses: actions/setup-go@v3
       with:
-        go-version: v1.19
+        go-version: v1.20
     - name: Verify that imports are organized
       run: make verify-imports
 
@@ -35,6 +35,6 @@ jobs:
     - name: Set Go
       uses: actions/setup-go@v3
       with:
-        go-version: v1.19
+        go-version: v1.20
     - name: Verify that the latest WebhookConfigurations, ClusterRoles, and CustomResourceDefinitions have been generated
       run: make manifests && git diff --exit-code
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ Here are a few things to go over before getting started with CodeFlare Operator
 ## Environment setup
 
 The following should be installed in your working environment:
- - Go 1.19.x
+ - Go 1.20.x
    - [Download release](https://go.dev/dl/)
    - [Install Instructions](https://go.dev/doc/install)
  - [Operator SDK](https://sdk.operatorframework.io/docs/installation/)
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi8/go-toolset:1.19.13 as builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.20.10 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/Makefile b/Makefile
@@ -12,17 +12,17 @@ VERSION ?= v0.0.0-dev
 BUNDLE_VERSION ?= $(VERSION:v%=%)
 
 # INSTASCALE_VERSION defines the default version of the InstaScale controller
-INSTASCALE_VERSION ?= v0.3.1
+INSTASCALE_VERSION ?= v0.4.0
 INSTASCALE_REPO ?= github.com/project-codeflare/instascale
 
 # MCAD_VERSION defines the default version of the MCAD controller
-MCAD_VERSION ?= v1.38.1
+MCAD_VERSION ?= v1.39.0
 MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher
 # Upstream MCAD is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
 MCAD_CRD ?= ${MCAD_REPO}/config/crd?ref=${MCAD_VERSION}
 
 # KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing)
-KUBERAY_VERSION ?= v1.0.0-rc.1
+KUBERAY_VERSION ?= v1.0.0
 
 # RAY_VERSION defines the default version of Ray (used for testing)
 RAY_VERSION ?= 2.5.0
@@ -158,7 +158,7 @@ modules: ## Update Go dependencies.
 	go mod tidy
 
 .PHONY: build
-build: modules fmt vet ## Build manager binary.
+build: fmt vet ## Build manager binary.
 	go build \
 		-ldflags " \
 			-X 'main.OperatorVersion=$(BUILD_VERSION)' \
@@ -169,7 +169,7 @@ build: modules fmt vet ## Build manager binary.
 		-o bin/manager main.go
 
 .PHONY: run
-run: modules manifests fmt vet ## Run a controller from your host.
+run: manifests fmt vet ## Run a controller from your host.
 	go run ./main.go
 
 .PHONY: image-build
@@ -198,7 +198,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && IMAGE=$(IMG) perl -i -pe 's/codeflare-operator-controller-image=(.*)$$/codeflare-operator-controller-image=$$ENV{"IMAGE"}/' params.env
 	$(KUSTOMIZE) build config/${ENV} | kubectl apply -f -
 	git restore config/*
 
@@ -229,7 +229,7 @@ SED ?= /usr/bin/sed
 KUSTOMIZE_VERSION ?= v4.5.4
 CODEGEN_VERSION ?= v0.27.2
 CONTROLLER_TOOLS_VERSION ?= v0.9.2
-YQ_VERSION ?= v4.30.8 ## latest version that works with go1.19
+YQ_VERSION ?= v4.35.2 ## latest version that works with go1.20
 OPERATOR_SDK_VERSION ?= v1.27.0
 GH_CLI_VERSION ?= 2.30.0
 
@@ -283,8 +283,8 @@ validate-bundle: install-operator-sdk
 
 .PHONY: bundle
 bundle: manifests kustomize install-operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
+	cd config/manager && IMAGE=$(IMG) perl -i -pe 's/codeflare-operator-controller-image=(.*)$$/codeflare-operator-controller-image=$$ENV{"IMAGE"}/' params.env
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	cd config/manifests && $(KUSTOMIZE) edit add patch --patch '[{"op":"add", "path":"/metadata/annotations/containerImage", "value": "$(IMG)" }]' --kind ClusterServiceVersion
 	cd config/manifests && $(KUSTOMIZE) edit add patch --patch '[{"op":"add", "path":"/spec/replaces", "value": "codeflare-operator.$(PREVIOUS_VERSION)" }]' --kind ClusterServiceVersion
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
diff --git a/OWNERS b/OWNERS
@@ -9,7 +9,9 @@ approvers:
 reviewers:
   - anishasthana
   - astefanutti
+  - ChristianZaccaria
   - dimakis
+  - Fiona-Waters
   - jbusche
   - kpostoffice
   - maxusmusti
diff --git a/README.md b/README.md
@@ -8,11 +8,11 @@ CodeFlare Stack Compatibility Matrix
 
 | Component                    | Version                                                                                           |
 |------------------------------|---------------------------------------------------------------------------------------------------|
-| CodeFlare Operator           | [v1.0.1](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.0.1)             |
-| Multi-Cluster App Dispatcher | [v1.38.1](https://github.com/project-codeflare/multi-cluster-app-dispatcher/releases/tag/v1.38.1) |
-| CodeFlare-SDK                | [v0.12.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.12.1)                  |
-| InstaScale                   | [v0.3.1](https://github.com/project-codeflare/instascale/releases/tag/v0.3.1)                     |
-| KubeRay                      | [v1.0.0-rc.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.0.0-rc.0)                              |
+| CodeFlare Operator           | [v1.1.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.1.0)             |
+| Multi-Cluster App Dispatcher | [v1.39.0](https://github.com/project-codeflare/multi-cluster-app-dispatcher/releases/tag/v1.39.0) |
+| CodeFlare-SDK                | [v0.13.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.13.0)                  |
+| InstaScale                   | [v0.4.0](https://github.com/project-codeflare/instascale/releases/tag/v0.4.0)                     |
+| KubeRay                      | [v1.0.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.0.0)                              |
 <!-- Compatibility Matrix end -->
 
 ## Development
diff --git a/config/crd/mcad/kustomization.yaml b/config/crd/mcad/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v1.38.1
+- github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v1.39.0
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,3 +3,19 @@ resources:
 
 generatorOptions:
   disableNameSuffixHash: true
+
+configMapGenerator:
+- name: stack-config
+  envs:
+    - params.env
+configurations:
+  - params.yaml
+
+vars:
+- name: codeflare_operator_controller_image
+  objref:
+    kind: ConfigMap
+    name: stack-config
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.codeflare-operator-controller-image
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -28,13 +28,13 @@ spec:
         # it is recommended to ensure that all your Pods/Containers are restrictive.
         # More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
         # Please uncomment the following code if your project does NOT have to work on old Kubernetes
-        # versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
+        # versions < 1.20 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
         # seccompProfile:
         #   type: RuntimeDefault
       containers:
       - command:
         - /manager
-        image: controller:latest
+        image: $(codeflare_operator_controller_image)
         imagePullPolicy: Always
         name: manager
         securityContext:
diff --git a/config/manager/params.env b/config/manager/params.env
@@ -0,0 +1 @@
+codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.1.0
diff --git a/config/manager/params.yaml b/config/manager/params.yaml
@@ -0,0 +1,3 @@
+varReference:
+  - path: spec/template/spec/containers[]/image
+    kind: Deployment
diff --git a/config/manifests/bases/codeflare-operator.clusterserviceversion.yaml b/config/manifests/bases/codeflare-operator.clusterserviceversion.yaml
@@ -2,7 +2,45 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: '[]'
+    alm-examples: |-
+      [{
+        "apiVersion": "workload.codeflare.dev/v1beta1",
+        "kind": "AppWrapper",
+        "metadata": {"name": "0001-aw-generic-deployment-1"},
+        "spec": {
+          "resources": {
+            "GenericItems": [{
+              "replicas": 1,
+              "generictemplate": {
+                "apiVersion": "apps/v1",
+                "kind": "Deployment",
+                "metadata": {
+                  "name": "0001-aw-generic-deployment-1",
+                  "labels": {"app": "0001-aw-generic-deployment-1"}
+                },
+                "spec": {
+                  "selector": {"matchLabels": {"app": "0001-aw-generic-deployment-1"}},
+                  "replicas": 2,
+                  "template": {
+                    "metadata": {"labels": {"app": "0001-aw-generic-deployment-1"}},
+                    "spec": {
+                      "containers": [{
+                        "name": "0001-aw-generic-deployment-1",
+                        "image": "kicbase/echo-server:1.0",
+                        "ports": [{"containerPort": 80}],
+                        "resources": {
+                          "requests": {"cpu": "100m", "memory": "256Mi"},
+                          "limits": {"cpu": "100m", "memory": "256Mi"}
+                        }
+                      }]
+                    }
+                  }
+                }
+              }
+            }]
+          }
+        }
+      }]
     capabilities: Basic Install
     categories: AI/Machine Learning, Big Data
     operatorframework.io/suggested-namespace: openshift-operators
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -1,8 +1,9 @@
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-- bases/codeflare-operator.clusterserviceversion.yaml
 - ../default
 - ../scorecard
+- bases/codeflare-operator.clusterserviceversion.yaml
+
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/test/e2e/install-codeflare-sdk.sh b/test/e2e/install-codeflare-sdk.sh
diff --git a/test/e2e/mnist_raycluster_sdk.py b/test/e2e/mnist_raycluster_sdk.py
diff --git a/test/e2e/mnist_raycluster_sdk_test.go b/test/e2e/mnist_raycluster_sdk_test.go
diff --git a/test/upgrade/olm_upgrade_test.go b/test/upgrade/olm_upgrade_test.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.1.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+varReference:`
	`2`	`+ - path: spec/template/spec/containers[]/image`
	`3`	`+ kind: Deployment`