Merge pull request #58 from Datasance/main

Datasance improvements

Author: kilton

.DS_Store

@@ -2,6 +2,7 @@ name: CI
 on:
   push: 
     branches:
+      - main
       - develop
       - release*
     tags: [v*]
@@ -11,18 +12,16 @@ on:
       - LICENSE
   pull_request:
   # Sequence of patterns matched against refs/heads
-    branches:    
+    branches:
+      - main    
       - develop
       - release*
     paths-ignore:
       - README.md
       - CHANGELOG.md
       - LICENSE
 env:
-  PROJECT: 'focal-freedom-236620'
   IMAGE_NAME: 'operator'
-  GKE_CLUSTER: 'iofogctl-ci'
-  GKE_ZONE: 'us-central1-a'
 
 jobs:
   Operator:
@@ -36,22 +35,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
           fetch-depth: 0
-    - uses: actions/setup-go@v4
-      with:
-        go-version: '1.19'
-    - run: go version
-    - name: golangci-lint
-      uses: golangci/golangci-lint-action@v3
-      with:
-        version: v1.50.1
-        args: --timeout=5m0s
-    - uses: azure/setup-kubectl@v3
-      id: install
-    - name: Set up Kustomize
-      run: |-
-        curl -sfLo kustomize https://github.com/kubernetes-sigs/kustomize/releases/download/v3.1.0/kustomize_3.1.0_linux_amd64
-        chmod u+x ./kustomize
-    - run: sudo make bats
+
     - name: 'Get Previous tag'
       id: previoustag
       uses: "WyriHaximus/github-action-get-previous-tag@v1"
@@ -76,73 +60,31 @@ jobs:
         service_account_key: ${{ secrets.GKE_SA_KEY }}
         project_id: ${{ env.PROJECT }}
 
-    # Get the GKE credentials so we can deploy to the cluster
-    - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-      with:
-        cluster_name: ${{ env.GKE_CLUSTER }}
-        location: ${{ env.GKE_ZONE }}
-        credentials: ${{ secrets.GKE_SA_KEY }}
     - name: Login to Github Container Registry
+      
       uses: docker/login-action@v2
       with:
         registry: "ghcr.io"
         username: ${{ github.actor }}
-        password: ${{ github.token }}
+        password: ${{ secrets.PAT }}
 
     - name: Build and Push to ghcr
+      
       uses: docker/build-push-action@v3
       id: build_push_ghcr
       with:
-        file: './Dockerfile'
+        file: Dockerfile
         push: true
+        outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=operator
         tags: |
-          ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
-          ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:latest
-        context: './'
-        
-    - name: Build and Push to GCR
-      if: ${{ steps.tags.outcome }} == 'success'
-      id: build_push_gcr
-      uses: RafikFarhad/push-to-gcr-github-action@v5-beta
-      with:
-        gcloud_service_key: ${{ secrets.GCLOUD_SERVICE_KEY }}
-        registry: gcr.io
-        project_id: ${{ env.PROJECT }}
-        image_name: ${{ env.IMAGE_NAME }}
-        image_tag: latest, ${{ steps.tags.outputs.VERSION }}
-        dockerfile: './Dockerfile'
-        context: './'
+          ghcr.io/datasance/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
+          ghcr.io/datasance/${{ env.IMAGE_NAME }}:latest
+          ghcr.io/datasance/${{ env.IMAGE_NAME }}:main
 
-    - name: Kustomize
-      shell: bash
-      run: |
-        set -e
-        IMAGE="gcr.io/focal-freedom-236620/operator:${{ steps.tags.outputs.VERSION }}"
-        cd config/operator
-        kustomize edit set image "$IMAGE"
-        kustomize build . > /tmp/deployment.yaml
-        cp /tmp/deployment.yaml ./deployment.yaml
-        cat ./deployment.yaml | grep "image: $IMAGE"
-    
-    - name: Feature tests
-      shell: bash
-      id: feature_test
-      run: |
-        set -e
-        cp test/conf/env.sh.tpl test/conf/env.sh
-        sed -i "s/<<NAMESPACE>>/${{ github.run_number }}/g" test/conf/env.sh
-        sed -i "s/<<OP_VERSION>>/${{ steps.tags.outputs.VERSION }}/g" test/conf/env.sh
-        make feature
-    - name: Cleanup tests
-      if: failure() && steps.feature_test.outcome == 'failure'
-      shell: bash
-      run: |
-        set -e
-        kubectl delete ns ${{ github.run_number }}
     - run: mkdir -p ${{ github.workspace }}/artifact
     - run: echo ${{ steps.tags.outputs.VERSION }} > ${{ github.workspace }}/artifact/version.txt
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
           name: operator
           path:  ${{ github.workspace }}/artifact/version.txt

.github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine as builder
+FROM golang:1.22-alpine3.20 AS builder
 
 WORKDIR /operator
 
@@ -17,8 +17,20 @@ COPY ./hack/ ./hack/
 RUN make build
 RUN cp ./bin/iofog-operator /bin
 
-FROM alpine:3.16
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
 WORKDIR /
+
+RUN microdnf install shadow-utils && \
+    microdnf clean all
+RUN useradd --uid 10000 runner
+
+
+COPY LICENSE LICENSE
 COPY --from=builder /bin/iofog-operator /bin/
+LABEL org.opencontainers.image.description=operator
+LABEL org.opencontainers.image.source=https://github.com/datasance/iofog-operator
+LABEL org.opencontainers.image.licenses=EPL2.0
+
+USER 10000
 
 ENTRYPOINT ["/bin/iofog-operator", "--enable-leader-election"]

Dockerfile

@@ -0,0 +1,26 @@
+FROM golang:1.22-alpine3.20 AS builder
+
+WORKDIR /operator
+
+RUN apk add --update --no-cache bash curl git make
+
+COPY ./go.* ./
+COPY ./Makefile ./
+RUN make controller-gen
+
+COPY ./main.go ./
+COPY ./apis/ ./apis/
+COPY ./internal/ ./internal/
+COPY ./controllers/ ./controllers/
+COPY ./hack/ ./hack/
+
+RUN make build
+RUN cp ./bin/iofog-operator /bin
+
+FROM alpine:3.19
+WORKDIR /
+COPY --from=builder /bin/iofog-operator /bin/
+LABEL org.opencontainers.image.description=operator
+LABEL org.opencontainers.image.source=https://github.com/datasance/iofog-operator
+LABEL org.opencontainers.image.licenses=EPL2.0
+ENTRYPOINT ["/bin/iofog-operator", "--enable-leader-election"]

Dockerfile-alphine

@@ -1,13 +1,13 @@
 OS = $(shell uname -s | tr '[:upper:]' '[:lower:]')
 
 VERSION = $(shell cat PROJECT | grep "version:" | sed "s/^version: //g")
-PREFIX = github.com/eclipse-iofog/iofog-operator/v3/internal/util
-LDFLAGS += -X $(PREFIX).portManagerTag=v3.0.0-beta1
-LDFLAGS += -X $(PREFIX).kubeletTag=v3.0.0-beta1
-LDFLAGS += -X $(PREFIX).proxyTag=v3.0.0-beta1
-LDFLAGS += -X $(PREFIX).routerTag=v3.0.0-beta1
-LDFLAGS += -X $(PREFIX).controllerTag=v3.0.0-beta1
-LDFLAGS += -X $(PREFIX).repo=gcr.io/focal-freedom-236620
+PREFIX = github.com/datasance/iofog-operator/v3/internal/util
+LDFLAGS += -X $(PREFIX).portManagerTag=v3.1.2
+LDFLAGS += -X $(PREFIX).kubeletTag=v3.0.1
+LDFLAGS += -X $(PREFIX).proxyTag=v3.0.2
+LDFLAGS += -X $(PREFIX).routerTag=v3.2.0
+LDFLAGS += -X $(PREFIX).controllerTag=v3.4.1
+LDFLAGS += -X $(PREFIX).repo=ghcr.io/datasance
 
 export CGO_ENABLED ?= 0
 ifeq (${DEBUG},)
@@ -18,7 +18,7 @@ endif
 # Image URL to use all building/pushing image targets
 IMG ?= operator:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:crdVersions=v1,allowDangerousType=true"
+CRD_OPTIONS ?= "crd:crdVersions=v1,allowDangerousTypes=true"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -27,6 +27,11 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
+# Check if GOBIN is an absolute path
+ifneq ($(shell [ -d $(GOBIN) ] && echo yes),yes)
+$(error GOBIN must be set to an absolute path and exist)
+endif
+
 all: build
 
 .PHONY: build
@@ -107,7 +112,7 @@ controller-gen: ## Install controller-gen
 ifeq (, $(shell which controller-gen))
 	@{ \
 	set -e ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
@@ -118,7 +123,7 @@ kustomize: ## Install kustomize
 ifeq (, $(shell which kustomize))
 	@{ \
 	set -e ;\
-	go install sigs.k8s.io/kustomize/kustomize/v4@v4.5.7 ;\
+	go install sigs.k8s.io/kustomize/kustomize/v5@v5.5.0 ;\
 	}
 KUSTOMIZE=$(GOBIN)/kustomize
 else

Makefile

@@ -1,13 +1,14 @@
-domain: iofog.org
-layout: go.kubebuilder.io/v2
+domain: datasance.com
+layout: go.kubebuilder.io/v4
 multigroup: true
 projectName: iofog-operator
-repo: github.com/eclipse-iofog/iofog-operator
+repo: github.com/datasance/iofog-operator
 resources:
 - kind: Application
   version: v3
 - kind: ControlPlane
   version: v3
 version: "3"
 plugins:
-  go.sdk.operatorframework.io/v2-alpha: {}
+  manifests.sdk.operatorframework.io/v2: {}
+  scorecard.sdk.operatorframework.io/v2: {}

PROJECT

@@ -1,8 +1,8 @@
 package apis
 
 import (
-	appsv3 "github.com/eclipse-iofog/iofog-operator/v3/apis/apps/v3"
-	cpv3 "github.com/eclipse-iofog/iofog-operator/v3/apis/controlplanes/v3"
+	appsv3 "github.com/datasance/iofog-operator/v3/apis/apps/v3"
+	cpv3 "github.com/datasance/iofog-operator/v3/apis/controlplanes/v3"
 	extsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -11,7 +11,7 @@ import (
 )
 
 func NewControlPlaneCustomResource() *extsv1.CustomResourceDefinition {
-	apiVersions := []string{"v3", "v2"}
+	apiVersions := []string{"v3"}
 	versions := make([]extsv1.CustomResourceDefinitionVersion, len(apiVersions))
 	preserveUnknownFields := true
 
@@ -37,10 +37,10 @@ func NewControlPlaneCustomResource() *extsv1.CustomResourceDefinition {
 
 	return &extsv1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "controlplanes.iofog.org",
+			Name: "controlplanes.datasance.com",
 		},
 		Spec: extsv1.CustomResourceDefinitionSpec{
-			Group: "iofog.org",
+			Group: "datasance.com",
 			Names: extsv1.CustomResourceDefinitionNames{
 				Kind:     "ControlPlane",
 				ListKind: "ControlPlaneList",
@@ -54,7 +54,7 @@ func NewControlPlaneCustomResource() *extsv1.CustomResourceDefinition {
 }
 
 func NewAppCustomResource() *extsv1.CustomResourceDefinition {
-	apiVersions := []string{"v3", "v2", "v1"}
+	apiVersions := []string{"v3"}
 	preserveUnknownFields := true
 	versions := make([]extsv1.CustomResourceDefinitionVersion, len(apiVersions))
 
@@ -80,10 +80,10 @@ func NewAppCustomResource() *extsv1.CustomResourceDefinition {
 
 	return &extsv1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "apps.iofog.org",
+			Name: "apps.datasance.com",
 		},
 		Spec: extsv1.CustomResourceDefinitionSpec{
-			Group: "iofog.org",
+			Group: "datasance.com",
 			Names: extsv1.CustomResourceDefinitionNames{
 				Kind:     "Application",
 				ListKind: "ApplicationList",

apis/apis.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v3
 
 import (
-	"github.com/eclipse-iofog/iofog-go-sdk/v3/pkg/apps"
+	"github.com/datasance/iofog-go-sdk/v3/pkg/apps"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

apis/apps/v3/application_types.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v3 contains API Schema definitions for the apps v3 API group
 // +kubebuilder:object:generate=true
-// +groupName=iofog.org
+// +groupName=datasance.com
 package v3
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "iofog.org", Version: "v3"} //nolint:gochecknoglobals
+	GroupVersion = schema.GroupVersion{Group: "datasance.com", Version: "v3"} //nolint:gochecknoglobals
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} //nolint:gochecknoglobals